Working on AD integration
Merge pull request #910 from emmanuel-keller/1.5

Working on AD integration