[SD-945] Modified client to match with Matadata Attributes
Merge remote-tracking branch 'upstream/devel' into devel