Closes #2421 - Only set the displayName if it's not empty

Closes #2421