Hotfix for link_to_user for #20269
Merge branch 'master' into development