Merge AssetsManager improvement