WRITG - move some things out of basic#2844

osse101 merged 2 commits intovg-json-data:mastervg-json-data/sm-json-data:masterfrom

kjbranch:writgkjbranch/sm-json-data:writgCopy head branch name to clipboard