hotfix for missing gateway status check
Merge remote-tracking branch 'origin/7.x-4.x' into 7.x-4.x-springboard_p2p