Merge branch 'ps/apply-beyond-symlink' into maint-2.30