merge in master-release history after reset to 65c5313605627690c24fcafe8d3ca1cb908abc7e