Merge branch 'preprocess-kernel-before-building-cache-key' into 'master'

Preprocess the kernel before building the cache key

See merge request !127