LPS-43974 and LPS-42531

LPS-43974 and LPS-42531