[MERGE] merge with dev-addons3