Merge latest directory-profiles code