merge in master-release history after reset to 8c008397141bf9a7d619eb2c53452bf3e397da39