Merge pull request #22211 from totten/master-544-fwd