DP-2282: Added commands to get and set gateway id