Merge branch dev with rel-7.4 #15063

This PR generated automatically to merge dev with rel-7.4. Please review the changed files before merging to prevent any errors that may occur.