[MERGE] merge with dev addons-3 branch