Merge set-testing-before-app into assetmanager