Merge pull request #648 from emmanuel-keller/1.5

Implements #646
Merge pull request #649 from emmanuel-keller/1.5

Missing collection