[TP] #28825 - Adjustments to searchperience-client-api fork