KFSPTS-3718 Add more functionality