FL-1776: update eblits with variety of fixes