merge in master-release history after reset to 3db03a5ab0cb7713529c298531be6da7c2193525