Merge branch 'metadata-pp'