merge in master-release history after reset to 645b709de8d84081062f8bebcd67bff7b51840b7