merge in master-release history after reset to bc7068920d9b30aa5f66b699e74c00e11aec88bf