merge in master-release history after reset to d7bef2bee16b6e529d55b505764a79821fe3c825