Merge pull request 'fix high cpu' (#63) from fix-cpu into develop