Merge "Add router check, subnet attached gateway IP update or deletion"