Merge pull request #451 from hnyman/fw-zone-len