merging r10246:10247 from developer branch to fix manual frequency setting problem