Work towards 1.7.2. update