Review of frequency-rt branch prior to submitting PR upstream

Not mine.