LPS-34269

LPS-34269 and LPS-34438