Merge "New framework performance tests." into ics-mr1