Merge branch 'jc/apply-beyond-symlink' into maint