Metadata performance fix in 312
2 files changed