Implements #1105
Implements log info on #1105
Merge pull request #1107 from emmanuel-keller/1.6

Implements #1105