merge in master-release history after reset to 7fbc7481cc972db9fd604def8684e72e43073254