Not configuring outgoing fw if fw is disabled
Merge commit '4608d0b'