Merging Source v1.7.2: main class changes