merge in master-release history after reset to 81bef1d74568d623b9db3c5409740dc21c0bbc08