Merge Assetmanager branch into master