[Merge] meged with dev trunk addons team 1