Sync with master #3 [1724]

updated to 1.7.2 (2.1.8 [1724])