DC2B-124: Resolved the validation bug on Edit metadata.
Merge remote-tracking branch 'origin/master'