Merge "testtype cleanup." into ics-mr0