We used setSwitch() on allow-2136-from, move to set
Added option to disable forwarding to master