Merge branch 'move-addons-to-different-project'