Merge branch 'sg/maint-gitdir-in-subdir' into maint