merge in master-release history after reset to 143498533e1acc163c1d3c49290d1270a130b9e6