Merge branch 'ar/unlink-err' into maint