Merge "Some optimizations." into ics-mr1