Merge "Refactor AssetManager"