merge in master-release history after reset to 11e9c9a0e59824f387fbc94f900b0cc051d5fa17