Unusual high CPU usage

Some prior discussion here: Release 1.6.0