LPS-32353 [Quick win]