Metadata changes from origin/master

Signed-off-by: salmank <salmank@plumgrid.com>