Merging Source v1.7.2: top-level class changes