Merge "More performance work:" into ics-mr1