KFSPTS-3659 Add change after code review