merge in master-release history after reset to f218d8824388174af16b9cb08b1e6da34fcde750