Fix git empty dirs
Merge with v1x
Merge with v1x