AUTO-531
AUTO-516
AUTO-532
AUTO-516
Merge pull request #147 from GrabNetworks/531

AUTO-531 AUTO-516 AUTO-532