Merge pull request #637 from emmanuel-keller/1.6

Initial implementation of #626
Merge pull request #644 from emmanuel-keller/1.6

1.6