Merge "Dev branch for ICS MR2."