Final cleanup and adjustments for fence_mode = bridged deployments [ISSUE #23]