LPS-49358 Fix performance regression caused by LPS-49080