merge in master-release history after reset to b9e879d429945cebc12a52e1ceaf0846eea564f1