AUTO-575
AUTO-574
AUTO-574
AUTO-574
AUTO-548
Merge pull request #175 from GrabNetworks/auto575

AUTO-557  AUTO-574