Merge pull request #8063 from bpfoley/rteradio