Merge "Asset updates" into ics-mr1