merge in master-release history after reset to 8c6319e0194b3f6f4695d3553fc350a9f11e5759