LPS-33928 and LPS-33982

Please review my changes

Thanks!