merge in master-release history after reset to 6f52460eb56b252327b97d9dd21017fa5d9afdfc