LPS-32465 [Quick win]