Re #8635. Using the correct kind of delete now.
Merge branch 'feature/8635_kernel_strings' into develop