KRAFDBCK-9927 fixing initial code review