LPS-33466

LPS-27798 and LPS-33915