Merge "Add new directory for stats metadata"