sync to cm at Commits on Aug 14, 2014