Commit 7: fixed issues  ISALE-148 and VTA-590 eof.