Merge pull request #17781 from totten/master-vortex-max