Implements #1105
Implements log info on #1105
Merge pull request #1106 from emmanuel-keller/1.5

Implements #1105