LPS-34258

LPS-34334 and LPS-34341