Merge pull request #20114 from demeritcowboy/simplify-actionlink2