merge in master-release history after reset to 841568006407d35de16f4641c3da65c1ee1eb688