MDL-20534 lti: various fixes