Work in progress on #1060
Merge pull request #1067 from emmanuel-keller/1.5

Work in progress on #1060