Alex/lti fixes to release

Add fixes for BLD-561 and BLD-564