merge in master-release history after reset to c16fe6b308db373d0520ff9183e349597addb822