Merge pull request #134 from GrabNetworks/dev-cs

Dev cs AUTO-457,459
Versioning
AUTO-496
Merge remote-tracking branch 'origin/auto496' into dev-cs