Merge "Update assets"