Merge pull request #5110 from jow-/wireless-band-option