merge in master-release history after reset to 99119b4564cea78be7a94d432dd8d8a3664615b7