merge in master-release history after reset to 76ab2d2568d6973041e296197e3bbd76366728a1