added gateway recovery
Merge remote-tracking branch 'origin/zeromq' into zeromq
added gateway recovery, process later feature