Metadata util functions
Merge branch 'local' into working