merge in master-release history after reset to 498692535c7ceecb3434a99c47e4c90ba3fdd90e