Merge "Fix: pass frequency as int" into sc-dev