Issue #3381877 by AdamPS, smustgrave, viren18febS: Wrong comment display for sites configuring base field display in the UI
mentioned in commit dc84da68
mentioned in commit d73384c9