Fix incorrect ETA calculation
Cleaup includes
Merge pull request #2059 from sorokin/fix-eta

Fix ETA calculation