Merge "GateKeeper proxy service"