Merge commit '10662ae78f8900e28f13f6abdeee002c25b8c18d' * commit '10662ae78f8900e28f13f6abdeee002c25b8c18d': border for the non-badge case
Merge commit '10662ae78f8900e28f13f6abdeee002c25b8c18d' * commit '10662ae78f8900e28f13f6abdeee002c25b8c18d': border for the non-badge case