KFSPTS-3718 add some validation