Re #8355. Adding some of the deletes back.
Merge branch 'feature/8355_kernel_memory' into develop