Implements #1254
Add webservice for #1254
Merge pull request #1266 from emmanuel-keller/1.6

Implements #1254