Issue #3381877 by AdamPS, smustgrave, viren18febS: Wrong comment display for...
Issue #3381877 by AdamPS, smustgrave, viren18febS: Wrong comment display for sites configuring base field display in the UI
(cherry picked from commit 54e5f9e7)
(cherry picked from commit dc84da68)