Gateway selection added when removing an application
11 files changed