[MERGE] Merge with dev-addons3 branch