Review of frequency-rt branch prior to submitting PR upstream

@Mona77 Is this your change, or someone else's upstream?