merging from developer branch to fix manual frequency setting problem, for real this...