merge 2.7.4 release branch (#17550)