Added merge per-dir config
Fixed raw support content type