merge in master-release history after reset to 44e89d3e2fc136f52fcdd9e0ab4384f2a744d3e2