LPS-32361 [Quick Win]