diff --git a/core/src/main/java/hudson/model/TimeZoneProperty.java b/core/src/main/java/hudson/model/TimeZoneProperty.java
index 2675448dad80..95956026a76e 100644
--- a/core/src/main/java/hudson/model/TimeZoneProperty.java
+++ b/core/src/main/java/hudson/model/TimeZoneProperty.java
@@ -62,6 +62,11 @@ public String getDisplayName() {
             return Messages.TimeZoneProperty_DisplayName();
         }
 
+        @Override
+        public String getDescription() {
+            return Messages.TimeZoneProperty_Description();
+        }
+
         @Override
         public UserProperty newInstance(User user) {
             return new TimeZoneProperty();
diff --git a/core/src/main/java/hudson/model/UserPropertyDescriptor.java b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
index 66762bf3c716..b5a115404be3 100644
--- a/core/src/main/java/hudson/model/UserPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
@@ -26,6 +26,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.model.userproperty.UserPropertyCategory;
 import java.util.Optional;
 import org.jenkinsci.Symbol;
@@ -126,4 +127,15 @@ public boolean isEnabled() {
     protected @CheckForNull String getUserPropertyCategoryAsString() {
         return null;
     }
+
+    /**
+     * Optional description for the configurable object
+     * Displays as plain text
+     *
+     * @since TODO
+     */
+    @Nullable
+    public String getDescription() {
+        return null;
+    }
 }
diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java b/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java
index 3763036b9686..5308a6d7c6ee 100644
--- a/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java
+++ b/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java
@@ -65,6 +65,11 @@ public String getDisplayName() {
             return Messages.consoleUrlProviderDisplayName();
         }
 
+        @Override
+        public String getDescription() {
+            return Messages.consoleUrlProviderDisplayName_Description();
+        }
+
         @Override
         public UserProperty newInstance(User user) {
             return new ConsoleUrlProviderUserProperty();
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index d56c57ff5ee0..fbe7a70ae53b 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -408,7 +408,8 @@ Jenkins.IsRestarting=Jenkins is restarting
 User.IllegalUsername="{0}" is prohibited as a username for security reasons.
 User.IllegalFullname="{0}" is prohibited as a full name for security reasons.
 
-TimeZoneProperty.DisplayName=User Defined Time Zone
+TimeZoneProperty.DisplayName=Time zone
+TimeZoneProperty.Description=Select a time zone to use rather than the system default
 TimeZoneProperty.DisplayDefaultTimeZone=Default
 TimeZoneProperty.current_time_in_=Current time in {0}: {1}
 TimeZoneProperty.current_time_on_server_in_in_proposed_di=Current time on server in {0}: {1}; in proposed display zone: {2}
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly b/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly
index 2c3bde11f734..988c2993af69 100644
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly
+++ b/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:entry field="timeZoneName" title="${%title}">
+  <f:entry field="timeZoneName">
     <f:select />
   </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties
deleted file mode 100644
index df0ea286bace..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=Time Zone
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties
deleted file mode 100644
index 754326ab5ed3..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=Fuseau horaire
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties
deleted file mode 100644
index dd8664b821bc..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Italian localization plugin for Jenkins
-# Copyright © 2020 Alessandro Menti
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-title=Fuso orario
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties
deleted file mode 100644
index 9a2e6c2da365..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2020 Takashi Harano
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=タイムゾーン
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties
deleted file mode 100644
index 69165e681fc9..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-title=Fuso horário
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties
deleted file mode 100644
index 81b54683063b..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=Tidszon
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties
deleted file mode 100644
index a35c89f565ff..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=時區
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html
deleted file mode 100644
index 4bb418b353c4..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-  Specify user defined time zone for displaying time rather than system default.
-</div>
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html
deleted file mode 100644
index 92d9ed7db039..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-  システムデフォルトの代わりに、ユーザーが指定したタイムゾーンで時刻を表示します。
-</div>
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html
deleted file mode 100644
index 25f230308212..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  Ange användardefinierad tidszon för visa klockslag istället för
-  systemstandarden.
-</div>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
index 8d2a8e9368e7..c6b458cecfe9 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
     <l:layout permission="${app.ADMINISTER}" title="${%title}">
         <st:include page="sidepanel.jelly" it="${it.targetUser}" />
         <l:main-panel>
-            <f:form method="post" action="configSubmit" name="config">
+            <f:form method="post" action="configSubmit" name="config" class="jenkins-form">
                 <h1>
                     ${%title}
                 </h1>
@@ -39,18 +39,20 @@ THE SOFTWARE.
                 <j:set var="it" value="${thisAction.targetUser}" />
                 <j:set var="instance" value="${it}"/>
 
-                <f:entry title="${%Full name}" help="/help/user/fullName.html">
-                    <f:textbox field="fullName" />
-                </f:entry>
-                <f:entry title="${%Description}" help="/help/user/description.html">
-                    <f:textarea field="description" codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription" />
-                </f:entry>
+                <f:section>
+                    <f:entry title="${%Full name}" description="${%Full name.Description}">
+                        <f:textbox field="fullName" />
+                    </f:entry>
+                    <f:entry title="${%Description}" description="${%Description.Description}">
+                        <f:textarea field="description" codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription" />
+                    </f:entry>
+                </f:section>
 
                 <j:set var="descriptors" value="${thisAction.myCategoryDescriptors}" />
                 <j:set var="instances" value="${it.properties}" />
                 <j:forEach var="d" items="${descriptors}" varStatus="loop">
                     <j:if test="${d.enabled}">
-                        <f:section title="${d.displayName}">
+                        <f:section title="${d.displayName}" description="${d.description}">
                             <j:set var="descriptor" value="${d}" />
                             <j:set var="instance" value="${instances[d]}" />
 
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
index 41e4d5b9689f..dfeb5024042c 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
@@ -21,5 +21,7 @@
 # THE SOFTWARE.
 
 title=Account
-Full\ name=Full Name
+Full\ name=Full name
+Full\ name.Description=We recommend using your real name so people can recognize you instead of your ID
 Description=Description
+Description.Description=Enter a short description about yourself so that visitors know who you are
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
index 57f5af6d2097..3ea825131863 100644
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
+++ b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
@@ -5,9 +5,6 @@
           <!-- Dummy field to always have an entry in form submissions so users can delete all providers. -->
           <f:checkbox field="unused" checked="true" />
         </f:invisibleEntry>
-        <f:block>
-            ${%description}
-        </f:block>
         <f:entry>
             <f:repeatableHeteroProperty field="providers" hasHeader="true" oneEach="true" header="${%Providers}" />
         </f:entry>
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties
deleted file mode 100644
index 9ebb3cd824ca..000000000000
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties
+++ /dev/null
@@ -1 +0,0 @@
-description=Controls what visualization tool handles build console links. Providers higher in the list take precedence over providers lower in the list. All providers configured here take precedence over those configured globally by administrators.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties
deleted file mode 100644
index d0a8ed3d0459..000000000000
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties
+++ /dev/null
@@ -1 +0,0 @@
-description=Styr vilket visualiseringsverktyg som hanterar konsollänkar för byggen. Leverantörer högre upp i listan har företräde framför leverantörer längre ned i listan. Alla leverantörer som konfigurerats här har företräde framför de som har konfigurerats globalt av administratörer.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/console/Messages.properties b/core/src/main/resources/jenkins/console/Messages.properties
index 20a460d49709..72347e1df5b6 100644
--- a/core/src/main/resources/jenkins/console/Messages.properties
+++ b/core/src/main/resources/jenkins/console/Messages.properties
@@ -1,2 +1,3 @@
 consoleUrlProviderDisplayName=Console URL Provider
+consoleUrlProviderDisplayName.Description=Select which view you want to use for build console links. Views listed higher will be prioritized over those listed lower. The views you choose here will be used rather than those set by administrators.
 defaultProviderDisplayName=Default
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/section.jelly b/core/src/main/resources/lib/form/section.jelly
index 706920ad6ecc..1e7e7ebbb2d5 100644
--- a/core/src/main/resources/lib/form/section.jelly
+++ b/core/src/main/resources/lib/form/section.jelly
@@ -32,6 +32,9 @@ THE SOFTWARE.
       If null is given, the entire <f:section> tag becomes no-op.
       ]]>
     </st:attribute>
+    <st:attribute name="description" since="TODO">
+      Optional attribute to set a description for the section
+    </st:attribute>
     <st:attribute name="icon">
       Optional attribute to set an icon for the section, this is only visible when using section-to-sidebar-items.js
     </st:attribute>
@@ -50,6 +53,11 @@ THE SOFTWARE.
           ${attrs.title}
         </div>
       </j:if>
+      <j:if test="${attrs.description != null}">
+        <div class="jenkins-section__description">
+          ${attrs.description}
+        </div>
+      </j:if>
       <d:invokeBody />
     </section>
   </f:rowSet>
diff --git a/war/src/main/scss/components/_section.scss b/war/src/main/scss/components/_section.scss
index 9a53a7238339..4e0768d8f6e0 100644
--- a/war/src/main/scss/components/_section.scss
+++ b/war/src/main/scss/components/_section.scss
@@ -34,6 +34,13 @@
   font-weight: 500;
 }
 
+.jenkins-section__description {
+  // Tweaked margin so that it appears visually centred when placed next to `.jenkins-section__title`
+  margin: -0.5rem 0 1rem;
+  color: var(--text-color-secondary);
+  line-height: 1.66;
+}
+
 .jenkins-section__items {
   display: grid;
   grid-template-columns: 1fr;
diff --git a/war/src/main/webapp/help/user/description.html b/war/src/main/webapp/help/user/description.html
deleted file mode 100644
index 8d4d4ee62729..000000000000
--- a/war/src/main/webapp/help/user/description.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  This description is placed on the user top page so that visitors can know who
-  you are. You can use any HTML tags (or markup in the configured language)
-  here. Consider putting some links to other pages related to you.
-</div>
diff --git a/war/src/main/webapp/help/user/description_bg.html b/war/src/main/webapp/help/user/description_bg.html
deleted file mode 100644
index 81894e55816e..000000000000
--- a/war/src/main/webapp/help/user/description_bg.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Това описание стои отгоре на вашата страница като потребител, така че другите
-  потребители да знаят кой сте. Може да използвате HTML или друг език с
-  маркиране, стига да е настроен. Добре е да поставите връзки към други
-  страници, които ви описват.
-</div>
diff --git a/war/src/main/webapp/help/user/description_de.html b/war/src/main/webapp/help/user/description_de.html
deleted file mode 100644
index 4ddca12dfbf9..000000000000
--- a/war/src/main/webapp/help/user/description_de.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Diese Beschreibung wird in der Benutzeransicht angezeigt. Andere Benutzer
-  können dadurch mehr über Sie erfahren. Sie können in der Beschreibung
-  beliebige HTML-Auszeichnungen verwenden, also beispielsweise auch Links auf
-  andere Webangebote, die mit Ihnen in Zusammenhang stehen.
-</div>
diff --git a/war/src/main/webapp/help/user/description_fr.html b/war/src/main/webapp/help/user/description_fr.html
deleted file mode 100644
index 7744e9764cea..000000000000
--- a/war/src/main/webapp/help/user/description_fr.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Cette description est placée sur la page principale de l'utilisateur, afin que
-  les visiteurs puissent vous connaitre. Vous pouvez utiliser des tags HTML.
-  N'hésitez pas à ajouter des liens vers d'autres pages vous concernant.
-</div>
diff --git a/war/src/main/webapp/help/user/description_it.html b/war/src/main/webapp/help/user/description_it.html
deleted file mode 100644
index 009e9203ac3d..000000000000
--- a/war/src/main/webapp/help/user/description_it.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  Questa descrizione è collocata nella pagina principale utente in modo che i
-  visitatori possano conoscere la propria identità. In questo campo è possibile
-  utilizzare tutti i tag HTML (o i marcatori nel linguaggio configurato). Si
-  prenda in considerazione l'aggiunta di alcuni collegamenti ad altre pagine
-  correlate a sé stessi.
-</div>
diff --git a/war/src/main/webapp/help/user/description_ja.html b/war/src/main/webapp/help/user/description_ja.html
deleted file mode 100644
index c2a1c9a21f53..000000000000
--- a/war/src/main/webapp/help/user/description_ja.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  この説明はあなたが誰なのか知ることができるように、ユーザーのトップページに表示されます。
-  ここではどんなHTMLタグでも使用できます。あなたに関する他のページにリンクすることを考えてみてください。
-</div>
diff --git a/war/src/main/webapp/help/user/description_nl.html b/war/src/main/webapp/help/user/description_nl.html
deleted file mode 100644
index 458d60b66613..000000000000
--- a/war/src/main/webapp/help/user/description_nl.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  Deze beschrijving zal worden toegevoegd aan de specifiek pagina van een
-  gebruiker. Op deze manier zullen andere gebruikers van Jenkins, eenvoudig, te
-  weten kunnen komen wie U bent. HTML kan gebruikt worden in dit veld. Het kan
-  interessant zijn om in deze beschrijving, referentie toe te voegen naar ander
-  pagina's over uzelf of uw activiteiten.
-</div>
diff --git a/war/src/main/webapp/help/user/description_pt_BR.html b/war/src/main/webapp/help/user/description_pt_BR.html
deleted file mode 100644
index 15e9a0c45428..000000000000
--- a/war/src/main/webapp/help/user/description_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Esta descri&#231;&#227;o &#233; colocada no topo da p&#225;gina do
-  usu&#225;rio tal que os visitantes possam saber quem voc&#234; &#233;.
-  Voc&#234; pode usar qualquer marca&#231;&#227;o HTML aqui. Considere colocar
-  alguns links para outras p&#225;ginas relacionadas a voc&#234;.
-</div>
diff --git a/war/src/main/webapp/help/user/description_ru.html b/war/src/main/webapp/help/user/description_ru.html
deleted file mode 100644
index 08e6008fde69..000000000000
--- a/war/src/main/webapp/help/user/description_ru.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Это описание будет помещено в шапку страницы пользователя, так чтобы
-  посетители могли определить кто вы. Вы можете использовать HTML. Возможно,
-  размещение ссылок с подробной информацией о вас будет уместным.
-</div>
diff --git a/war/src/main/webapp/help/user/description_tr.html b/war/src/main/webapp/help/user/description_tr.html
deleted file mode 100644
index ca5cf685ca82..000000000000
--- a/war/src/main/webapp/help/user/description_tr.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  Bu a&#231;&#305;klama alan&#305;, kullan&#305;c&#305; sayfas&#305;n&#305;n en
-  &#252;st&#252;nde yer alacakt&#305;r. Ziyaret&#231;ilerin sizi
-  tan&#305;malar&#305; i&#231;in bu alan&#305; bilgilendirme ama&#231;l&#305;
-  kullanabilirsiniz. HTML tag'leri kullan&#305;labilir. Sizinle ilgili
-  olabilecek ba&#351;ka sayfalar&#305;n linklerini de koyabilirsiniz.
-</div>
diff --git a/war/src/main/webapp/help/user/description_zh_TW.html b/war/src/main/webapp/help/user/description_zh_TW.html
deleted file mode 100644
index 4ff51596f575..000000000000
--- a/war/src/main/webapp/help/user/description_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  這個說明會放在使用者首頁上，讓訪客知道您是誰。 您可以使用任何 HTML
-  標籤。說不定您可以放一些有關自己的連結。
-</div>
diff --git a/war/src/main/webapp/help/user/fullName.html b/war/src/main/webapp/help/user/fullName.html
deleted file mode 100644
index 453efdda5e5e..000000000000
--- a/war/src/main/webapp/help/user/fullName.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Specify your name in a more human-friendly format, so that people can see your
-  real name as opposed to your ID. For example, "Jane Doe" is usually easier for
-  people to understand than IDs like "jd513".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_bg.html b/war/src/main/webapp/help/user/fullName_bg.html
deleted file mode 100644
index 6c27c38ad910..000000000000
--- a/war/src/main/webapp/help/user/fullName_bg.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  Указване на име вместо идентификатор, с което хората да ви разпознават
-  по-лесно. „Иван Петров“ е по-разбираемо от „ip2873“.
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_de.html b/war/src/main/webapp/help/user/fullName_de.html
deleted file mode 100644
index e7f1a6d4fe59..000000000000
--- a/war/src/main/webapp/help/user/fullName_de.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Geben Sie Ihren vollständigen Namen an, damit andere Benutzer Ihren echten
-  Namen anstelle Ihres Benutzerkontos sehen können. Beispiel: "Jasmin
-  Mustermann" ist für die meisten Benutzer verständlicher als das Benutzerkonto
-  "jm531".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_fr.html b/war/src/main/webapp/help/user/fullName_fr.html
deleted file mode 100644
index e6438c57da48..000000000000
--- a/war/src/main/webapp/help/user/fullName_fr.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Indiquez votre nom dans un format lisible pour un humain. Les visiteurs
-  verront votre vrai nom à côté de votre identifiant. "Jean Dupont" est plus
-  facile à retenir que "jd513"...
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_it.html b/war/src/main/webapp/help/user/fullName_it.html
deleted file mode 100644
index 9a81fd145602..000000000000
--- a/war/src/main/webapp/help/user/fullName_it.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Specificare il proprio nome in un formato più a misura d'uomo in modo che gli
-  utenti possano visualizzare il proprio nome reale anziché il proprio ID. Ad
-  esempio, "Mario Rossi" è solitamente più facile da comprendere per le persone
-  anziché "mr513".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_ja.html b/war/src/main/webapp/help/user/fullName_ja.html
deleted file mode 100644
index 451745435d07..000000000000
--- a/war/src/main/webapp/help/user/fullName_ja.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  IDではなく本名が分かるように、より親しみのある形式であなたの名前を指定します。
-  例えば、"Jane Doe"は"jd513"のようなIDよりも分かりやすいでしょう。
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_nl.html b/war/src/main/webapp/help/user/fullName_nl.html
deleted file mode 100644
index 225051ab6181..000000000000
--- a/war/src/main/webapp/help/user/fullName_nl.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Vul uw volledige naam in. Deze naam zal gebruikt worden i.p.v. uw id waar
-  mogelijk. Bv. "Els Desmet" is voor de meeste mensen duidelijker dan een id
-  zoals "ed513".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_pt_BR.html b/war/src/main/webapp/help/user/fullName_pt_BR.html
deleted file mode 100644
index 5a69cacb7065..000000000000
--- a/war/src/main/webapp/help/user/fullName_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Especifique seu nome em um formato mais amig&#225;vel, tal que as pessoas
-  possam ver seu verdadeiro nome ao inv&#233;s de seu ID. Por exemplo,
-  "Jo&#227;o da Silva" &#233; geralmente mais f&#225;cil para as pessoas
-  entenderem do que "js513".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_ru.html b/war/src/main/webapp/help/user/fullName_ru.html
deleted file mode 100644
index 6de0eb415bab..000000000000
--- a/war/src/main/webapp/help/user/fullName_ru.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Укажите ваше имя в более дружелюбной форме, чтобы могли видеть ваше настоящее
-  имя, а не просто идентификатор. Например, "Василий Пупкин" обычно приятнее
-  видеть, чем "vas_pup_1".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_tr.html b/war/src/main/webapp/help/user/fullName_tr.html
deleted file mode 100644
index 229a7dea2a09..000000000000
--- a/war/src/main/webapp/help/user/fullName_tr.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Kullan&#305;c&#305;lar&#305;n sizi kullan&#305;c&#305; ad&#305;n&#305;zdan
-  daha anlaml&#305; bir isimle tan&#305;yabilmesini isterseniz, tam
-  ad&#305;n&#305;z&#305; bu k&#305;s&#305;ma yazabilirsiniz. Mesela, "Jane Doe",
-  "jd513"ten daha anlaml&#305;d&#305;r.
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_zh_TW.html b/war/src/main/webapp/help/user/fullName_zh_TW.html
deleted file mode 100644
index ddbbb5556df7..000000000000
--- a/war/src/main/webapp/help/user/fullName_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  設定您能讓一般人看得懂的名字，讓別人知道您的姓名，而不光只有 ID。
-  舉例來說，大多數人應該都會覺得「張三」比 "mrchang3" 這個 ID 還要容易看懂。
-</div>