merge in master-release history after reset to 72a0c459345ca68dd062b7f50e50676452db3ce9