Merge pull request #137 from GrabNetworks/dev-cs

Dev cs AUTO-495
AUTO-445
AUTO-502