Implements #1162
Implements #1179
Remove SOAP references
Merge pull request #1182 from emmanuel-keller/master

Improvements