Merged directory services. Fixes #14