Merge remote-tracking branch 'remotes/origin/bug_739_fix_CT_tuner_timer_bug'