merge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89