Merge remote-tracking branch 'mjb/freq_menu'