Alex/lti fixes to release

Contains fixes for BLD-561 and BLD-564