3ed851151f
* cater for empty labels and new DisplayNameFromDS field
* simplify
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* increase priority for ds display name
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 3de091edf1)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>