[RJA-1652][feature] marking gateways