Merge branch 'rework_kl' into 'NIFTy_7'

Rework kl

See merge request !540
12 jobs for NIFTy_7 in 12 minutes and 22 seconds (queued for 1 second)