KFSPTS-3718 add more changes