Merge editable meta data feature related changes to QA

Merge editable meta data feature related changes to QA