merge in master-release history after reset to ae43ff7f68473b02b4af527caf93cb13602e17df