Merge "fix: avoid blanks after displayed names"