KFSPTS-3718 add more changes
Revert "KFSPTS-3718 add more changes"

This reverts commit 62acd5ee535bd12723722408bfbde81167296459.
KFSPTS-3718 add more changes