Fix directory html request
Merge branch 'c4c.staging.hotfix' into c4c.staging