LPS-35026 Redo LPS-34728 due to the change made in LPS-35017