merge in master-release history after reset to 67ee990d324229ab0565ce632bd5a04297e16a01