performance optimization for small systems
remove the external heater task
Merge branch 'develop'