KRAFDBCK-9927 code review 3 corrections