Merge "Various performance and other work." into ics-mr1