merge in master-release history after reset to d25b89d1e417082b7e4ee9db7c08ab8095d48d87