Merge branch 'mw/symlinks' into maint