merge in master-release history after reset to d94567d9637aae33905fc7f292a615996df6d3c9