[MERGE]Merged:-lp:trunk-dev-addons2