Merge branch 'unoptimized-kernel' into 'master'

Add support for unoptimized kernels

See merge request !66