Update on dav module
Rebase
Merge