AUTO-529
AUTO-510
Merge pull request #145 from GrabNetworks/auto529

AUTO-529 AUTO-510