KRAFDBACK-9927 code review 2 changes completed