Re #8355. Fixing the builds.
Merge branch 'feature/8355_kernel_memory' into develop