Merge pull request #1221 from chandnisingh/MLHR-1637

Cleaned up setup and not ignoring currentFile and offset if that is not ...