Fix missing empty folders in builds
Merge branch 'hotfix/3.7.7.9' into production