Add option to select gateway manually. Close #3505