merge in master-release history after reset to 4c8fa0583902249fa87bedcc1f2983ae734a5e41