merge in master-release history after reset to 57e6772a2c8f555d362ab1374ccadf99455461cd