Some fixes & improuvements
Merge branch 'origin/ae_webdav'
Merge branch 'origin/devel'