merge in master-release history after reset to 4799fa447c2c9681c0c51fa8151974a764679fdc