Fix merge order so that AD attributes take precedence over local stuff.
Merge branch 'feature/merge-order' into develop