DDBEASY 220 - Metadata separated by comma.
Merge remote-tracking branch 'origin/DDBEASY-220' into development