Merge pull request #1637 from deepak-srivastava/logs