merge in master-release history after reset to baef67c7627a395c8e414eb71c28e0a71b3557b0