Merged branch metadataView manually
Merged and resolved conflicts