Merge pull request #146 from GrabNetworks/dev-cs

Dev cs 530
Versioning
AUTO-541 fixed versioning
Merge remote-tracking branch 'origin/integration' into dev-cs