merge in master-release history after reset to cbc09e47a6cd9164219948caf848303ba19efbb9