[RJA-1652][feature] marking gateways
Merge pull request #805 from bugzmanov/fb-remoting

[RJA-1652][feature] marking gateways