Merge branch 'mt/t4129-with-setgid-dir' into maint