Working on #1053
Merge pull request #1057 from emmanuel-keller/1.5

Working on #1053