LPS-33928 and LPS-33982

Please check my changes

Thanks!