LPS-32375 [Quick win]