merge in master-release history after reset to e8eef02cca050c85e8288880701235005c1400a3