merge in master-release history after reset to 931e6a86827af47c9cad1452bfab34fb8346cbaf