[QUICK WIN] LPS-34978