KRAFDBCK-9927 squashed and ready, I hopes