Excessive CPU
Merge branch 'jvm_memory'