merge in master-release history after reset to c6e0c64632bdf9183b90307f1a39bd6d83e6a978