We need to match based on things that aren't likely to change, like the qamFrequency and qamProgram.
Merge remote-tracking branch 'origin/master'