merge in master-release history after reset to a7104a806f863fd5a88cac4aed10c38b94fc9c95