Merge branch 'Bug_fix_high_cpu_usage'