KFSPTS-3482 Add changes after code review