From ce3e7262a8115b8a620125d2c2bf0162fb11ac13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Tue, 18 Nov 2025 22:01:59 +0100
Subject: [PATCH 01/15] fix: Update code

---
 dhis-2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index 9ef28ea13cab..9710d89f1726 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -133,7 +133,7 @@
     <postgis-jdbc.version>2.5.1</postgis-jdbc.version>
     <datasource-proxy.version>1.11.0</datasource-proxy.version>
     <mysql-connector-j.version>9.3.0</mysql-connector-j.version>
-    <clickhouse-jdbc.version>0.9.2</clickhouse-jdbc.version>
+    <clickhouse-jdbc.version>0.9.4</clickhouse-jdbc.version>
 
     <!-- Servlet -->
     <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>

From 3b8d97e5ab492083073a5215372a593cb4e76481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Mon, 19 Jan 2026 16:05:35 +0100
Subject: [PATCH 02/15] fix: Update code

---
 .../dhis-api/src/main/java/org/hisp/dhis/user/User.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
index bea17735fee3..6ec17ad028ce 100644
--- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
+++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
@@ -97,8 +97,14 @@ public class User extends BaseIdentifiableObject implements MetadataObject {
   /** Required. Will be stored as a hash. */
   private String password;
 
+  /**
+   * 2FA secret.
+   */
   private String secret;
 
+  /**
+   * Type of 2FA authentication.
+   */
   private TwoFactorType twoFactorType;
 
   /** Date when password was changed. */
@@ -116,7 +122,7 @@ public class User extends BaseIdentifiableObject implements MetadataObject {
   /** List of previously used passwords. */
   private List<String> previousPasswords = new ArrayList<>();
 
-  /** Date of the user's last login. */
+  /** Date of last login of user account. */
   private Date lastLogin;
 
   /** The token used for a user account restore. Will be stored as a hash. */

From 3851d763e5eea7c43a6929aa0929283d12c7d826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Sun, 25 Jan 2026 23:33:13 +0100
Subject: [PATCH 03/15] fix: Update code

---
 dhis-2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index acf9876444d9..20cc6dd6e934 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -243,7 +243,7 @@
     <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
     <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
     <maven-enforcer-plugin.version>3.6.1</maven-enforcer-plugin.version>
-    <maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
+    <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
     <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
     <restrict-imports-enforcer.version>2.6.1</restrict-imports-enforcer.version>
     <versions-maven-plugin.version>2.20.1</versions-maven-plugin.version>

From f06e30a57ebe15ab65dc19d5e5c248644ba38129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Sun, 25 Jan 2026 23:42:15 +0100
Subject: [PATCH 04/15] fix: Update code

---
 .../dhis-api/src/main/java/org/hisp/dhis/user/User.java   | 8 ++------
 dhis-2/pom.xml                                            | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
index 6ec17ad028ce..84f7d8334646 100644
--- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
+++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
@@ -97,14 +97,10 @@ public class User extends BaseIdentifiableObject implements MetadataObject {
   /** Required. Will be stored as a hash. */
   private String password;
 
-  /**
-   * 2FA secret.
-   */
+  /** 2FA secret. */
   private String secret;
 
-  /**
-   * Type of 2FA authentication.
-   */
+  /** Type of 2FA authentication. */
   private TwoFactorType twoFactorType;
 
   /** Date when password was changed. */
diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index 20cc6dd6e934..a183f7734ba0 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -133,7 +133,7 @@
     <postgis-jdbc.version>2.5.1</postgis-jdbc.version>
     <datasource-proxy.version>1.11.0</datasource-proxy.version>
     <mysql-connector-j.version>9.3.0</mysql-connector-j.version>
-    <clickhouse-jdbc.version>0.9.4</clickhouse-jdbc.version>
+    <clickhouse-jdbc.version>0.9.2</clickhouse-jdbc.version>
 
     <!-- Servlet -->
     <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>

From 7a96a76e58e5ff5bf9f0733ce5c8f732ae8ae3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Mon, 26 Jan 2026 10:15:47 +0100
Subject: [PATCH 05/15] fix: Update code

---
 .../hisp/dhis/dataitem/query/shared/FilteringStatement.java  | 5 ++---
 .../org/hisp/dhis/dimension/DefaultDimensionService.java     | 4 +---
 .../java/org/hisp/dhis/mapping/DefaultMappingService.java    | 3 ---
 .../dhis/dxf2/metadata/DefaultMetadataExportServiceTest.java | 1 -
 .../webapi/controller/AbstractFullReadOnlyController.java    | 1 -
 .../hisp/dhis/webapi/controller/GeoJsonImportController.java | 4 +---
 .../webapi/controller/dataitem/DataItemServiceFacade.java    | 3 ---
 7 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataitem/query/shared/FilteringStatement.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataitem/query/shared/FilteringStatement.java
index 97cee8b34ff3..aef2f99b03a6 100644
--- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataitem/query/shared/FilteringStatement.java
+++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataitem/query/shared/FilteringStatement.java
@@ -30,7 +30,7 @@
 package org.hisp.dhis.dataitem.query.shared;
 
 import static lombok.AccessLevel.PRIVATE;
-import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
+import static org.apache.commons.lang3.ObjectUtils.getIfNull;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.hisp.dhis.dataitem.query.shared.ParamPresenceChecker.hasNonBlankStringPresence;
@@ -330,8 +330,7 @@ public static String identifiableTokenFiltering(
       MapSqlParameterSource paramsMap) {
     if (hasNonBlankStringPresence(paramsMap, IDENTIFIABLE_TOKEN_COMPARISON)) {
       String[] filteringWords =
-          defaultIfNull((String) paramsMap.getValue(IDENTIFIABLE_TOKEN_COMPARISON), EMPTY)
-              .split(",");
+          getIfNull((String) paramsMap.getValue(IDENTIFIABLE_TOKEN_COMPARISON), EMPTY).split(",");
 
       OptionalFilterBuilder optionalFilterBuilder = new OptionalFilterBuilder(paramsMap);
 
diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java
index fc0c22ab68bb..9a55ffda6a22 100644
--- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java
+++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java
@@ -115,7 +115,6 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodDimension;
-import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.RelativePeriodEnum;
 import org.hisp.dhis.program.ProgramDataElementDimensionItem;
 import org.hisp.dhis.program.ProgramDataElementOptionDimensionItem;
@@ -146,8 +145,6 @@ public class DefaultDimensionService implements DimensionService {
 
   private final CategoryService categoryService;
 
-  private final PeriodService periodService;
-
   private final OrganisationUnitService organisationUnitService;
 
   private final AclService aclService;
@@ -157,6 +154,7 @@ public class DefaultDimensionService implements DimensionService {
   private final MetadataMergeService metadataMergeService;
 
   private final DataDimensionExtractor dataDimensionExtractor;
+
   private final DataDimensionItemStore dataDimensionItemStore;
 
   // --------------------------------------------------------------------------
diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
index 2b22ed13e47d..32b489e0cc02 100644
--- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
+++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
@@ -39,7 +39,6 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.PeriodDimension;
-import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.RelativePeriods;
 import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramStage;
@@ -63,8 +62,6 @@ public class DefaultMappingService extends GenericAnalyticalObjectService<MapVie
 
   private final IndicatorService indicatorService;
 
-  private final PeriodService periodService;
-
   // -------------------------------------------------------------------------
   // MappingService implementation
   // -------------------------------------------------------------------------
diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultMetadataExportServiceTest.java b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultMetadataExportServiceTest.java
index 7be1215d0530..9ec44f532843 100644
--- a/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultMetadataExportServiceTest.java
+++ b/dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultMetadataExportServiceTest.java
@@ -151,7 +151,6 @@ void testGetMetadataWithDependenciesForDashboardWithMapView() {
     map.getMapViews().add(mapView);
 
     DashboardItem item = new DashboardItem();
-    item.setName("itemA");
     item.setMap(map);
 
     Dashboard dashboard = new Dashboard("dashboardA");
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractFullReadOnlyController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractFullReadOnlyController.java
index d78a3435522a..7412f7b61f02 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractFullReadOnlyController.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractFullReadOnlyController.java
@@ -465,7 +465,6 @@ private static Object getAttributeValue(Object obj, String attrId) {
     return ResponseEntity.ok(objectNode);
   }
 
-  @SuppressWarnings("unchecked")
   private ObjectNode getObjectInternal(String uid, GetObjectParams params, UserDetails currentUser)
       throws NotFoundException {
     T entity = getEntity(uid);
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/GeoJsonImportController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/GeoJsonImportController.java
index bab603b8ef75..92db4e213fc1 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/GeoJsonImportController.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/GeoJsonImportController.java
@@ -58,7 +58,6 @@
 import org.hisp.dhis.user.CurrentUser;
 import org.hisp.dhis.user.CurrentUserUtil;
 import org.hisp.dhis.user.UserDetails;
-import org.hisp.dhis.user.UserService;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -77,10 +76,9 @@
 @RestController
 @RequiredArgsConstructor
 public class GeoJsonImportController {
-
   private final GeoJsonService geoJsonService;
+
   private final JobExecutionService jobExecutionService;
-  private final UserService userService;
 
   @PostMapping(
       value = "/geometry",
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataitem/DataItemServiceFacade.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataitem/DataItemServiceFacade.java
index 96c7142df8c7..eefa3e420a0a 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataitem/DataItemServiceFacade.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataitem/DataItemServiceFacade.java
@@ -53,7 +53,6 @@
 import org.hisp.dhis.dxf2.common.OrderParams;
 import org.hisp.dhis.user.CurrentUserUtil;
 import org.hisp.dhis.user.UserDetails;
-import org.hisp.dhis.user.UserService;
 import org.hisp.dhis.webapi.webdomain.WebOptions;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Component;
@@ -69,8 +68,6 @@
 @RequiredArgsConstructor
 @Component
 public class DataItemServiceFacade {
-  private final UserService userService;
-
   private final QueryExecutor queryExecutor;
 
   /**

From a3766a24d177be656896476d4ef6f569e390140a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Mon, 26 Jan 2026 10:21:53 +0100
Subject: [PATCH 06/15] fix: Update code

---
 .../webapi/controller/dataitem/DataItemServiceFacadeTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/dataitem/DataItemServiceFacadeTest.java b/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/dataitem/DataItemServiceFacadeTest.java
index 7741cfda8fe9..54ad02abe586 100644
--- a/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/dataitem/DataItemServiceFacadeTest.java
+++ b/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/dataitem/DataItemServiceFacadeTest.java
@@ -92,7 +92,7 @@ class DataItemServiceFacadeTest {
   @BeforeEach
   public void setUp() {
     injectSecurityContext(new SystemUser());
-    dataItemServiceFacade = new DataItemServiceFacade(userService, queryExecutor);
+    dataItemServiceFacade = new DataItemServiceFacade(queryExecutor);
   }
 
   @Test

From b6d393a47f0f0e375ecbbcf710c00751cede7c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Mon, 26 Jan 2026 11:05:31 +0100
Subject: [PATCH 07/15] fix: Update code

---
 .../analytical_objects/dashboards_empty.yaml                   | 2 +-
 .../analytical_objects/dashboards_not_used_1year.yaml          | 2 +-
 .../analytical_objects/maps_not_used_1year.yaml                | 2 +-
 .../analytical_objects/visualizations_not_used_1year.yaml      | 2 +-
 .../categories/categories_dimensions_no_visualizations.yaml    | 2 +-
 .../categories/categories_same_category_options.yaml           | 2 +-
 .../categories_shared_category_options_in_combo.yaml           | 2 +-
 .../categories/categories_unique_category_combo.yaml           | 2 +-
 .../categories/category_option_combinations_cardinality.yaml   | 2 +-
 .../categories/category_option_combinations_disjoint.yaml      | 2 +-
 .../categories/category_option_combinations_no_names.yaml      | 2 +-
 .../categories/category_option_combos_have_duplicates.yaml     | 2 +-
 .../categories/category_option_groups_excess_members.yaml      | 2 +-
 .../categories/category_option_groups_sets_incomplete.yaml     | 2 +-
 .../categories/category_options_no_categories.yaml             | 2 +-
 .../categories/coc_no_category_combo.yaml                      | 2 +-
 .../categories/default_category_option_sharing.yaml            | 2 +-
 .../categories/invalid_category_combos.yaml                    | 2 +-
 .../data_elements/aggregate_des_abandoned.yaml                 | 2 +-
 .../aggregate_des_cannot_aggregate_operator_not_none.yaml      | 3 +--
 .../aggregate_des_datasets_different_period_types.yaml         | 2 +-
 .../aggregate_des_excess_groupset_membership.yaml              | 2 +-
 .../data_elements/aggregate_des_no_analysis.yaml               | 2 +-
 .../data_elements/aggregate_des_no_datasets.yaml               | 2 +-
 .../data_elements/aggregate_des_no_groups.yaml                 | 2 +-
 .../data_elements/aggregate_des_nodata.yaml                    | 2 +-
 .../datasets/datasets_custom_data_entry_forms_empty.yaml       | 2 +-
 .../data-integrity-checks/datasets/datasets_empty.yaml         | 2 +-
 .../datasets/datasets_not_assigned_to_org_units.yaml           | 2 +-
 .../data-integrity-checks/datasets/datasets_same_name.yaml     | 2 +-
 .../groups/group_size_category_option_group_sets.yaml          | 2 +-
 .../groups/group_size_category_option_groups.yaml              | 2 +-
 .../groups/group_size_data_element_groups.yaml                 | 2 +-
 .../groups/group_size_indicator_group_sets.yaml                | 2 +-
 .../groups/group_size_indicator_groups.yaml                    | 2 +-
 .../groups/group_size_organisation_unit_groups.yaml            | 2 +-
 .../groups/group_size_program_indicator_groups.yaml            | 2 +-
 .../data-integrity-checks/groups/group_size_user_groups.yaml   | 2 +-
 .../groups/group_size_validation_rule_groups.yaml              | 2 +-
 .../indicators/indicator_duplicate_types.yaml                  | 2 +-
 .../indicators/indicator_duplicated_terms.yaml                 | 2 +-
 .../indicators/indicator_exact_duplicates.yaml                 | 2 +-
 .../data-integrity-checks/indicators/indicator_noanalysis.yaml | 2 +-
 .../data-integrity-checks/indicators/indicator_nongrouped.yaml | 2 +-
 .../indicators/indicators_violating_exclusive_group_sets.yaml  | 2 +-
 .../option_sets/option_sets_wrong_sort_order.yaml              | 2 +-
 .../orgunits/compulsory_orgunit_groups.yaml                    | 2 +-
 .../data-integrity-checks/orgunits/orgunit_null_island.yaml    | 2 +-
 .../orgunits/orgunit_open_date_gt_closed_date.yaml             | 2 +-
 .../orgunits/orgunits_excess_group_memberships.yaml            | 2 +-
 .../orgunits/orgunits_invalid_geometry.yaml                    | 2 +-
 .../orgunits/orgunits_multiple_roots.yaml                      | 2 +-
 .../orgunits/orgunits_multiple_spaces.yaml                     | 2 +-
 .../data-integrity-checks/orgunits/orgunits_no_geometry.yaml   | 2 +-
 .../data-integrity-checks/orgunits/orgunits_no_groups.yaml     | 2 +-
 .../orgunits/orgunits_not_contained_by_parent.yaml             | 2 +-
 .../data-integrity-checks/orgunits/orgunits_orphaned.yaml      | 2 +-
 .../orgunits/orgunits_same_name_and_parent.yaml                | 2 +-
 .../orgunits/orgunits_trailing_spaces.yaml                     | 2 +-
 .../data-integrity-checks/periods/periods_3y_future.yaml       | 2 +-
 .../data-integrity-checks/periods/periods_distant_past.yaml    | 2 +-
 .../periods/periods_same_start_date_period_type.yaml           | 2 +-
 .../program_indicators_without_expression.yaml                 | 2 +-
 .../program_rules_inconsistent_program_program_stage.yaml      | 2 +-
 .../program_rules/program_rules_message_no_template.yaml       | 2 +-
 .../program_rules/program_rules_no_action.yaml                 | 2 +-
 .../program_rules/program_rules_no_priority.yaml               | 2 +-
 .../program_rules/program_rules_without_condition.yaml         | 2 +-
 .../programs/program_stages_no_programs.yaml                   | 2 +-
 .../programs/programs_custom_data_entry_form_empty.yaml        | 2 +-
 .../programs/programs_inconsistent_tracked_entity_type.yaml    | 2 +-
 ...entity_attributes_invalid_trigram_search_configuration.yaml | 2 +-
 .../tracked_entity_attributes_trigram_index_out_of_sync.yaml   | 2 +-
 .../tracked_entity_attributes_trigram_index_overview.yaml      | 2 +-
 .../data-integrity-checks/users/user_roles_no_authorities.yaml | 2 +-
 .../data-integrity-checks/users/user_roles_with_no_users.yaml  | 2 +-
 .../users/users_capture_ou_not_in_data_view_ou.yaml            | 2 +-
 .../users/users_capture_ou_not_in_tei_search_ou.yaml           | 2 +-
 .../data-integrity-checks/users/users_with_all_authority.yaml  | 2 +-
 .../users/users_with_invalid_usernames.yaml                    | 2 +-
 .../data-integrity-checks/users/users_with_no_user_role.yaml   | 2 +-
 .../validation_rules_undefined_missing_value_strategy.yaml     | 2 +-
 .../validation_rules/validation_rules_without_groups.yaml      | 2 +-
 83 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/dashboards_empty.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/dashboards_empty.yaml
index 512ad4485bad..e5f448e6f15f 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/dashboards_empty.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/dashboards_empty.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: dashboards_no_items
-  description: Dashboards with no items.
+  description: Dashboards with no items
   section: Dashboards
   section_order: 4
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/dashboards_not_used_1year.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/dashboards_not_used_1year.yaml
index 3d3753207b82..550edc53c0ec 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/dashboards_not_used_1year.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/dashboards_not_used_1year.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: dashboards_not_viewed_one_year
-  description: Dashboards which have not been actively viewed in the past 12 months
+  description: Dashboards which have not been actively viewed in the last 12 months
   section: Visualizations
   section_order: 3
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/maps_not_used_1year.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/maps_not_used_1year.yaml
index 365184e8716d..2e9230290710 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/maps_not_used_1year.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/maps_not_used_1year.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: maps_not_viewed_one_year
-  description: Maps which have not been viewed in the past 12 months
+  description: Maps which have not been viewed in the last 12 months
   section: Visualizations
   section_order: 1
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/visualizations_not_used_1year.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/visualizations_not_used_1year.yaml
index 9dcd774b2319..7c7fcb03cb5b 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/visualizations_not_used_1year.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/analytical_objects/visualizations_not_used_1year.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: visualizations_not_viewed_one_year
-  description: Visualizations which have not been viewed in the past 12 months
+  description: Visualizations which have not been viewed in the last 12 months
   section: Visualizations
   section_order: 1
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_dimensions_no_visualizations.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_dimensions_no_visualizations.yaml
index 6c137c6ea199..0366b5510a35 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_dimensions_no_visualizations.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_dimensions_no_visualizations.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: categories_dimensions_no_visualizations
-description: Categories which are enabled as a data dimension but which have no associated visualizations.
+description: Categories which are enabled as a data dimension but which have no associated visualizations
 section: Categories
 summary_sql: >-
   select
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
index d922a2acf9b5..55ba307bcad0 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: categories_same_category_options
-  description: Categories with the same category options
+  description: Categories with identical category options
   section: Categories
   section_order: 6
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_shared_category_options_in_combo.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_shared_category_options_in_combo.yaml
index 82a97bb0285b..8972aedfe796 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_shared_category_options_in_combo.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_shared_category_options_in_combo.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: category_options_shared_within_category_combo
-description:  Category combinations with categories which share the same category options.
+description:  Category combinations with categories with identical category options
 section: Categories
 section_order: 7
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_unique_category_combo.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_unique_category_combo.yaml
index 45c5ee2cbece..569669f9530f 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_unique_category_combo.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_unique_category_combo.yaml
@@ -32,7 +32,7 @@
 #   checks if a and b are the same set by checking that a is included in b and vice-versa
 ---
 name: categories_unique_category_combo
-description: Different category combinations should not have the exact same combination of categories.
+description: Category combinations with identical categories
 section: Categories
 summary_sql: >-
   with combo_sets as (
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_cardinality.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_cardinality.yaml
index 40f3916a4103..4ceb7a893e9c 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_cardinality.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_cardinality.yaml
@@ -25,7 +25,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #---
 name: cocs_wrong_cardinality
-description: Category option combinations with incorrect cardinality.
+description: Category option combinations with incorrect cardinality
 section: Categories
 section_order: 5
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_disjoint.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_disjoint.yaml
index 2d34c79447c3..a47ee881f77a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_disjoint.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_disjoint.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: category_option_combos_disjoint
-  description: Category option combinations with disjoint associations.
+  description: Category option combinations with disjoint associations
   section: Categories
   section_order: 4
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_no_names.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_no_names.yaml
index d17e0627f704..9f386aac89a9 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_no_names.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combinations_no_names.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: category_option_combos_no_names
-description: Category option combinations with no names.
+description: Category option combinations without names
 section: Categories
 section_order: 8
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combos_have_duplicates.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combos_have_duplicates.yaml
index 9605f198178e..97941a5cac4a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combos_have_duplicates.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combos_have_duplicates.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: category_option_combos_have_duplicates
-description: Category option combo duplicates, same category options and same category combo
+description: Category option combos with identical category options and category combos
 section: Categories
 section_order: 6
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_groups_excess_members.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_groups_excess_members.yaml
index 67c7d28fbff9..9848c93cfee0 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_groups_excess_members.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_groups_excess_members.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: category_options_excess_groupset_membership
-description: Category options which belong to multiple groups in a category option group set.
+description: Category options which belong to multiple groups in a category option group set
 section: Categories
 section_order: 10
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_groups_sets_incomplete.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_groups_sets_incomplete.yaml
index 3707569f30ee..2bf0a590326b 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_groups_sets_incomplete.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_groups_sets_incomplete.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: category_option_group_sets_incomplete
-description: Category option group sets which which do not contain all category options.
+description: Category option group sets which which do not contain all category options
 section: Categories
 section_order: 10
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_options_no_categories.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_options_no_categories.yaml
index ca31c72bc66f..8ab3f81b25f6 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_options_no_categories.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_options_no_categories.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: category_options_no_categories
-  description: Category options with no categories.
+  description: Category options without categories
   section: Categories
   section_order: 3
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/coc_no_category_combo.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/coc_no_category_combo.yaml
index 8b0a941450cf..c88353f15fbf 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/coc_no_category_combo.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/coc_no_category_combo.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: catoptioncombos_no_catcombo
-  description: Category options combinations with no category combination.
+  description: Category options combinations without category combinations
   section: Categories
   section_order: 7
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/default_category_option_sharing.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/default_category_option_sharing.yaml
index 3b6706ebcd04..0f4a6abb3db9 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/default_category_option_sharing.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/default_category_option_sharing.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: category_options_default_incorrect_sharing
-description: The default category option should be publicly shared with all users.
+description: The default category option should be publicly shared with all users
 section: Categories
 section_order: 20
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/invalid_category_combos.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/invalid_category_combos.yaml
index b1f8b8588f69..6723691fc39f 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/invalid_category_combos.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/invalid_category_combos.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: invalid_category_combos
-  description:  Category combinations which are invalid.
+  description:  Category combinations which are invalid
   section: Categories
   section_order: 7
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_abandoned.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_abandoned.yaml
index f1e6547c02d1..2fc2e8448530 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_abandoned.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_abandoned.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: data_elements_aggregate_abandoned
-  description: Aggregate data elements that have not been changed in last 100 days and do not have any data values.
+  description: Aggregate data elements not changed in the last 100 days and do not have any data values
   section: Data elements (aggregate)
   section_order: 5
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_cannot_aggregate_operator_not_none.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_cannot_aggregate_operator_not_none.yaml
index 5f99bb4fc648..8425609624c5 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_cannot_aggregate_operator_not_none.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_cannot_aggregate_operator_not_none.yaml
@@ -26,8 +26,7 @@
 #
 ---
   name: data_elements_cannot_aggregate_operator_not_none
-  description: Aggregate data elements which cannot be aggregated but have an aggregation operator set to something 
-      other than NONE
+  description: Aggregate data elements which cannot be aggregated but have an aggregation operator not set to NONE
   section: Data elements (aggregate)
   section_order: 9
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_datasets_different_period_types.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_datasets_different_period_types.yaml
index 4c235df478fd..c7721f3648b5 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_datasets_different_period_types.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_datasets_different_period_types.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: data_elements_aggregate_with_different_period_types
-  description: Aggregate data elements which belong to data sets with different period types.
+  description: Aggregate data elements which belong to data sets with different period types
   section: Data elements (aggregate)
   section_order: 7
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_excess_groupset_membership.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_excess_groupset_membership.yaml
index 90d29d9268c9..63007650666d 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_excess_groupset_membership.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_excess_groupset_membership.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: data_elements_violating_exclusive_group_sets
-description: Data elements which belong to multiple groups in a group set.
+description: Data elements which belong to multiple groups in a group set
 section: Data elements (aggregate)
 section_order: 10
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_analysis.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_analysis.yaml
index 522ed12105f4..69d8e0d4691a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_analysis.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_analysis.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: data_elements_aggregate_no_analysis
-  description: Aggregate data elements not used in any favourites (directly or through indicators)
+  description: Aggregate data elements not used in any favourites directly or through indicators
   section: Data elements (aggregate)
   section_order: 2
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_datasets.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_datasets.yaml
index 374f35ce9296..7ff47c3152eb 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_datasets.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_datasets.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: data_elements_without_datasets
-description: Aggregate data elements which are not a member of any dataset.
+description: Aggregate data elements which are not a member of any dataset
 section: Data elements (aggregate)
 section_order: 7
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_groups.yaml
index 69ea171d92f4..6c873dee7bda 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_no_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: data_elements_aggregate_no_groups
-  description: Aggregate data elements not in any data element groups.
+  description: Aggregate data elements not in any data element groups
   section: Data elements (aggregate)
   section_order: 4
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_nodata.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_nodata.yaml
index 1449c2c88075..58b55301ca6c 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_nodata.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/data_elements/aggregate_des_nodata.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: data_elements_aggregate_no_data
-description: Aggregate data elements with NO data values.
+description: Aggregate data elements without data values
 section: Data elements (aggregate)
 section_order: 6
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_custom_data_entry_forms_empty.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_custom_data_entry_forms_empty.yaml
index 54b400046424..0a3327b33707 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_custom_data_entry_forms_empty.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_custom_data_entry_forms_empty.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: datasets_custom_data_entry_forms_empty
-description: Datasets which have custom data entry forms which are empty.
+description: Datasets which have custom data entry forms which are empty
 section: Data sets
 section_order: 3
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_empty.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_empty.yaml
index f80a9d615d7c..9ad56d9e0de2 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_empty.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_empty.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: datasets_empty
-description: Datasets with no data elements.
+description: Datasets without data elements
 section: Data sets
 section_order: 1
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_not_assigned_to_org_units.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_not_assigned_to_org_units.yaml
index 779b37a86d1c..1b598e9d788e 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_not_assigned_to_org_units.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_not_assigned_to_org_units.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: datasets_not_assigned_to_org_units
-description: Data sets which have not been assigned to any organisation units.
+description: Data sets which have not been assigned to any organisation units
 section: Data sets
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_same_name.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_same_name.yaml
index 6bfef92fdd95..10dcc248db2a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_same_name.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/datasets/datasets_same_name.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: datasets_same_name
-description: Datasets with the same name or short name
+description: Datasets with duplicate name or short name
 section: Data sets
 section_order: 4
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_category_option_group_sets.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_category_option_group_sets.yaml
index cc92e2e3b65a..3e794b22fba8 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_category_option_group_sets.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_category_option_group_sets.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: category_option_group_sets_scarce
-description: Category option group sets should have at least two members.
+description: Category option group sets should have at least two members
 section: Group size
 section_order: 8
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_category_option_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_category_option_groups.yaml
index 72f545c64a80..1b619c3058f7 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_category_option_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_category_option_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: category_option_groups_scarce
-description: Category option groups should have at least two members.
+description: Category option groups should have at least two members
 section: Group size
 section_order: 8
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_data_element_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_data_element_groups.yaml
index 2de76cb19d99..3d6f68e98ddf 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_data_element_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_data_element_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: data_element_groups_scarce
-description: Data element groups should have at least two members.
+description: Data element groups should have at least two members
 section: Group size
 section_order: 1
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_indicator_group_sets.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_indicator_group_sets.yaml
index 758f5baaccd9..a532d5f8710d 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_indicator_group_sets.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_indicator_group_sets.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: indicator_group_sets_scarce
-description: Indicator groups sets should have at least two members.
+description: Indicator groups sets should have at least two members
 section: Group size
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_indicator_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_indicator_groups.yaml
index 323c02f812ea..49e7b2a850a4 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_indicator_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_indicator_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: indicator_groups_scarce
-description: Indicator groups should have at least two members.
+description: Indicator groups should have at least two members
 section: Group size
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_organisation_unit_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_organisation_unit_groups.yaml
index 44da9b02f4cf..5ffa2ef6851a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_organisation_unit_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_organisation_unit_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunit_groups_scarce
-description: Organisation unit groups should have at least two members.
+description: Organisation unit groups should have at least two members
 section: Group size
 section_order: 1
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_program_indicator_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_program_indicator_groups.yaml
index 023d3df66d32..106c9de6bb8e 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_program_indicator_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_program_indicator_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: program_indicator_groups_scarce
-description: Program indicator groups should have at least two members.
+description: Program indicator groups should have at least two members
 section: Group size
 section_order: 3
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_user_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_user_groups.yaml
index de6dd47ad955..07e23ed5832f 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_user_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_user_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: user_groups_scarce
-description: User groups should have at least two members.
+description: User groups should have at least two members
 section: Group size
 section_order: 9
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_validation_rule_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_validation_rule_groups.yaml
index 9729f36ca7e4..9a292755ea08 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_validation_rule_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/groups/group_size_validation_rule_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: validation_rule_groups_scarce
-description: Validation rule groups should have at least two members.
+description: Validation rule groups should have at least two members
 section: Group size
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_duplicate_types.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_duplicate_types.yaml
index 748a83a01d8a..6d8c94f7f0a9 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_duplicate_types.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_duplicate_types.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: indicator_types_duplicated
-description: Indicator types with the same factor.
+description: Indicator types with identical factors
 section: Indicators
 section_order: 5
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_duplicated_terms.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_duplicated_terms.yaml
index c3197ad6e250..835ff500c56f 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_duplicated_terms.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_duplicated_terms.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: indicators_duplicated_terms
-description: Indicators with the same terms.
+description: Indicators with identical terms
 section: Indicators
 section_order: 7
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_exact_duplicates.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_exact_duplicates.yaml
index 75050df4ed00..d92fa640dc56 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_exact_duplicates.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_exact_duplicates.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: indicators_exact_duplicates
-description: Indicators with the same formula.
+description: Indicators with identical formulas
 section: Indicators
 section_order: 8
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_noanalysis.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_noanalysis.yaml
index 44ac880a69e3..e94a363c2249 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_noanalysis.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_noanalysis.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: indicator_no_analysis
-description: Indicators not used in analytical objects.
+description: Indicators not used in any analytical objects
 section: Indicators
 section_order: 4
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_nongrouped.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_nongrouped.yaml
index a49078552bda..0a5bff9c9ec4 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_nongrouped.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicator_nongrouped.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: indicators_not_grouped
-description: Indicators not in any groups.
+description: Indicators not included in any groups
 section: Indicators
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicators_violating_exclusive_group_sets.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicators_violating_exclusive_group_sets.yaml
index bdab2901b14e..eb46892ffb64 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicators_violating_exclusive_group_sets.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/indicators/indicators_violating_exclusive_group_sets.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: indicators_violating_exclusive_group_sets
-description: Indicators which which belong to multiple groups in a group set.
+description: Indicators which belong to multiple groups in a group set
 section: Indicators
 section_order: 5
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/option_sets/option_sets_wrong_sort_order.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/option_sets/option_sets_wrong_sort_order.yaml
index a44fce36f0a9..1f57e96491f1 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/option_sets/option_sets_wrong_sort_order.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/option_sets/option_sets_wrong_sort_order.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name:  option_sets_wrong_sort_order
-description: Option sets with possibly wrong sort order.
+description: Option sets with possibly wrong sort order
 section: Option sets
 section_order: 3
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/compulsory_orgunit_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/compulsory_orgunit_groups.yaml
index 061c3a7de42a..fa35237c5a14 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/compulsory_orgunit_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/compulsory_orgunit_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: org_units_not_in_compulsory_group_sets
-description: Orgunits that are not in all compulsory orgunit group sets.
+description: Orgunits that are not in all compulsory orgunit group sets
 section: Organisation units
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunit_null_island.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunit_null_island.yaml
index 8755a978cab6..f662b86be9ea 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunit_null_island.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunit_null_island.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_null_island
-description: Organisation units located within 100 km of Null Island (0,0).
+description: Organisation units located within 100 km of Null Island (0,0)
 section: Organisation units
 section_order: 6
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunit_open_date_gt_closed_date.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunit_open_date_gt_closed_date.yaml
index cbfed6aaf5e8..0d2ddb9fd281 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunit_open_date_gt_closed_date.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunit_open_date_gt_closed_date.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_openingdate_gt_closeddate
-description: Organisation units which have an opening date later than the closed date.
+description: Organisation units which have an opening date after the closed date
 section: Organisation units
 summary_sql: >-
   with orgunit_future_opening_date as (select uid,name,openingdate,closeddate
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_excess_group_memberships.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_excess_group_memberships.yaml
index c2711bddd5b7..a09796f7c3ef 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_excess_group_memberships.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_excess_group_memberships.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: organisation_units_violating_exclusive_group_sets
-description: Organisation units which belong to multiple groups in a group set.
+description: Organisation units which belong to multiple groups in a group set
 section: Organisation units
 section_order: 10
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_invalid_geometry.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_invalid_geometry.yaml
index 6ed9972de4a6..add995fb7934 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_invalid_geometry.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_invalid_geometry.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_invalid_geometry
-description: Organisation units with invalid geometry.
+description: Organisation units with invalid geometry
 section: Organisation units
 section_order: 7
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_multiple_roots.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_multiple_roots.yaml
index d0df20dd1da2..2849b213e41a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_multiple_roots.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_multiple_roots.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_multiple_roots
-description: The organisation unit hierarchy should have a single root.
+description: Organisation unit hierarchy should have a single root
 section: Organisation units
 section_order: 8
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_multiple_spaces.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_multiple_spaces.yaml
index 4bae1195a97b..f7f5f1a0be83 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_multiple_spaces.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_multiple_spaces.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_multiple_spaces
-description: Organisation units should not have multiple spaces in their names or shortnames.
+description: Organisation units should not have multiple spaces in their names or shortnames
 section: Organisation units
 section_order: 6
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_no_geometry.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_no_geometry.yaml
index da3e2b984e6d..8426472a3ea5 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_no_geometry.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_no_geometry.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_no_coordinates
-description: Organisation units with no coordinates.
+description: Organisation units without coordinates
 section: Organisation units
 section_order: 9
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_no_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_no_groups.yaml
index 7e9c535090b2..5e25441cbb9b 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_no_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_no_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: organisation_units_without_groups
-description: Organisation units with no groups.
+description: Organisation units without groups
 section: Organisation units
 section_order: 13
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_not_contained_by_parent.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_not_contained_by_parent.yaml
index c927a4c914ee..888a2fa33892 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_not_contained_by_parent.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_not_contained_by_parent.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_not_contained_by_parent
-description: Organisation units with point coordinates should be contained by their parent.
+description: Organisation units with point coordinates should be contained by their parent
 section: Organisation units
 section_order: 5
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_orphaned.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_orphaned.yaml
index b03f7e8bb43a..e38a6abecb6c 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_orphaned.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_orphaned.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_orphaned
-description: Orphaned organisation units.
+description: Orphaned organisation units
 section: Organisation units
 section_order: 9
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_same_name_and_parent.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_same_name_and_parent.yaml
index 965c96accdec..3873e2aede43 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_same_name_and_parent.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_same_name_and_parent.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_same_name_and_parent
-description: Organisation units should not have the same name and parent.
+description: Organisation units should not have the same name and parent
 section: Organisation units
 section_order: 12
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_trailing_spaces.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_trailing_spaces.yaml
index 809b25017def..3cfaf4c8d612 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_trailing_spaces.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/orgunits/orgunits_trailing_spaces.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: orgunits_trailing_spaces
-description: Organisation units should not have trailing spaces.
+description: Organisation units should not have trailing spaces
 section: Organisation units
 section_order: 4
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_3y_future.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_3y_future.yaml
index 0ffedb1ffdf8..2a514e3b1ab3 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_3y_future.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_3y_future.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: periods_3y_future
-  description: Periods which are more than three years in the future.
+  description: Periods which are more than three years in the future
   section: Periods
   section_order: 2
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_distant_past.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_distant_past.yaml
index 8be93651b374..63d027c813d7 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_distant_past.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_distant_past.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: periods_distant_past
-  description: Periods which are in the distant past.
+  description: Periods which are in the distant past
   section: Periods
   section_order: 3
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_same_start_date_period_type.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_same_start_date_period_type.yaml
index 00d9f5b2282c..674344823ac7 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_same_start_date_period_type.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/periods/periods_same_start_date_period_type.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: periods_same_start_date_period_type
-  description: Periods with the same start date and period type.
+  description: Periods with the same start date and period type
   section: Periods
   section_order: 1
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_indicators/program_indicators_without_expression.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_indicators/program_indicators_without_expression.yaml
index 4827fde5a99e..e6e17b7d893f 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_indicators/program_indicators_without_expression.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_indicators/program_indicators_without_expression.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: program_indicators_without_expression
-description: Program indicators without an expression.
+description: Program indicators without expressions
 section: Program indicators
 section_order: 1
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_inconsistent_program_program_stage.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_inconsistent_program_program_stage.yaml
index d769061c8e24..e55cbdd55d63 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_inconsistent_program_program_stage.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_inconsistent_program_program_stage.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: program_rules_inconsistent_program_program_stage
-description: Program rules which are inconsistently linked to a program and program stage.
+description: Program rules which are inconsistently linked to a program and program stage
 section: Programs
 section_order: 3
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_message_no_template.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_message_no_template.yaml
index a4cf6a893640..8cc583eeee6f 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_message_no_template.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_message_no_template.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: program_rules_message_no_template
-description: Program rules actions which should send or schedule a message without a message template.
+description: Program rules actions which should send or schedule a message without a message template
 section: Program rules
 section_order: 4
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_action.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_action.yaml
index 7ed866e79e2f..732817c98a26 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_action.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_action.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: program_rules_no_action
-description: Program rules with no action.
+description: Program rules without actions
 section: Program rules
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_priority.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_priority.yaml
index 5d8f57eb9075..c73e84cc5356 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_priority.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_priority.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: program_rules_no_priority
-description: Program rules with no priority.
+description: Program rules without priorities
 section: Program rules
 section_order: 4
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_without_condition.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_without_condition.yaml
index 51cc4e6ccb45..d7630848b586 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_without_condition.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_without_condition.yaml
@@ -26,7 +26,7 @@
 #
 ---
   name: program_rules_without_condition
-  description: Program rules without a defined rule condition.
+  description: Program rules without rule conditions.
   section: Program rules
   section_order: 2
   summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/program_stages_no_programs.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/program_stages_no_programs.yaml
index d328f9d34f3a..b23ba17b40da 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/program_stages_no_programs.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/program_stages_no_programs.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: program_stages_no_programs
-description: Program stages with no associated program
+description: Program stages without associated programs
 section: Programs
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/programs_custom_data_entry_form_empty.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/programs_custom_data_entry_form_empty.yaml
index cbb67285f08b..5a9420f7cfd2 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/programs_custom_data_entry_form_empty.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/programs_custom_data_entry_form_empty.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: programs_custom_data_entry_forms_empty
-description: Programs which have custom data entry forms which are empty.
+description: Programs which have empty custom data entry forms
 section: Programs
 section_order: 1
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/programs_inconsistent_tracked_entity_type.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/programs_inconsistent_tracked_entity_type.yaml
index 12c69187710f..7dd731fb6ddd 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/programs_inconsistent_tracked_entity_type.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/programs/programs_inconsistent_tracked_entity_type.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: programs_inconsistent_tracked_entity_type
-description: Programs which are inconsistently linked to a tracked entity type.
+description: Programs which are inconsistently linked to a tracked entity type
 section: Programs
 section_order: 3
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_invalid_trigram_search_configuration.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_invalid_trigram_search_configuration.yaml
index 3dcd79821b1b..283d75a5d4b3 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_invalid_trigram_search_configuration.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_invalid_trigram_search_configuration.yaml
@@ -1,6 +1,6 @@
 ---
 name: tracked_entity_attributes_invalid_trigram_search_configuration
-description: Tracked entity attributes having a suboptimal search configuration that potentially results in slower search performance when searching tracked entities using those attributes.
+description: Tracked entity attributes having a suboptimal search configuration that potentially results in slower search performance when searching tracked entities using those attributes
 section: Tracked entity attributes
 section_order: 1
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_trigram_index_out_of_sync.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_trigram_index_out_of_sync.yaml
index 19f3d963d138..d8ffd107f38b 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_trigram_index_out_of_sync.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_trigram_index_out_of_sync.yaml
@@ -1,6 +1,6 @@
 ---
 name: tracked_entity_attributes_trigram_index_out_of_sync
-description: Partial trigram indexes on trackedentityattributevalue table must be in sync with the tracked entity attribute metadata configuration.
+description: Partial trigram indexes on trackedentityattributevalue table must be in sync with the tracked entity attribute metadata configuration
 section: Tracked entity attributes
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_trigram_index_overview.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_trigram_index_overview.yaml
index a51b5670005d..0c09f31f061c 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_trigram_index_overview.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/tracked_entity_attributes/tracked_entity_attributes_trigram_index_overview.yaml
@@ -1,6 +1,6 @@
 ---
 name: tracked_entity_attributes_trigram_index_overview
-description: Tracked entity attributes that have a partial trigram index created on the trackedentityattributevalue table.
+description: Tracked entity attributes that have a partial trigram index created on the trackedentityattributevalue table
 section: Tracked entity attributes
 section_order: 3
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/user_roles_no_authorities.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/user_roles_no_authorities.yaml
index 40b11d88bd8d..8520e0a06e50 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/user_roles_no_authorities.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/user_roles_no_authorities.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: user_roles_no_authorities
-description: User roles which have no authorities assigned.
+description: User roles without assigned authorities
 section: Users
 section_order: 4
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/user_roles_with_no_users.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/user_roles_with_no_users.yaml
index 182abcd4c144..59913f2a3828 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/user_roles_with_no_users.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/user_roles_with_no_users.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: user_roles_with_no_users
-description: User roles which have no users assigned.
+description: User roles without assigned users
 section: Users
 section_order: 5
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_capture_ou_not_in_data_view_ou.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_capture_ou_not_in_data_view_ou.yaml
index c49b5d20f56f..e11c8ca58d06 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_capture_ou_not_in_data_view_ou.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_capture_ou_not_in_data_view_ou.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: users_capture_ou_not_in_data_view_ou
-description: Users who have a data capture organisation unit which is not in their data view organisation unit hierarchy.
+description: Users which have a data capture organisation unit which is not in their data view organisation unit hierarchy
 section: Users
 section_order: 1
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_capture_ou_not_in_tei_search_ou.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_capture_ou_not_in_tei_search_ou.yaml
index 52c2a3f9b8d2..f6494afc6759 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_capture_ou_not_in_tei_search_ou.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_capture_ou_not_in_tei_search_ou.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: users_capture_ou_not_in_tei_search_ou
-description: Users who have a data capture organisation unit which is not within their tracked entity search organisation unit hierarchy.
+description: Users which have a data capture organisation unit which is not within their tracked entity search organisation unit hierarchy
 section: Users
 section_order: 2
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_all_authority.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_all_authority.yaml
index c67587c49ae1..6e928105b6ff 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_all_authority.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_all_authority.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: users_with_all_authority
-description: Users who have ALL authority assigned.
+description: Users which have the ALL authority assigned
 section: Users
 section_order: 6
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_invalid_usernames.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_invalid_usernames.yaml
index 611b9912645b..e0036d6518f3 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_invalid_usernames.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_invalid_usernames.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: users_with_invalid_usernames
-description: Users who have invalid usernames.
+description: Users which have invalid usernames
 section: Users
 section_order: 5
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_no_user_role.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_no_user_role.yaml
index 6095fa367a6b..9afd009a992c 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_no_user_role.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_no_user_role.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: users_with_no_user_role
-description: Users who have no user role assigned.
+description: Users without user roles
 section: Users
 section_order: 3
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/validation_rules/validation_rules_undefined_missing_value_strategy.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/validation_rules/validation_rules_undefined_missing_value_strategy.yaml
index 9eed218c9784..a3ec155d8c30 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/validation_rules/validation_rules_undefined_missing_value_strategy.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/validation_rules/validation_rules_undefined_missing_value_strategy.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: validation_rules_missing_value_strategy_null
-description: All validation rule expressions should have a missing value strategy.
+description: Validation rule expressions without missing value strategies
 section: Validation rules
 section_order: 1
 summary_sql: >-
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/validation_rules/validation_rules_without_groups.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/validation_rules/validation_rules_without_groups.yaml
index 5842c22f3f57..a65a075f3b32 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/validation_rules/validation_rules_without_groups.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/validation_rules/validation_rules_without_groups.yaml
@@ -26,7 +26,7 @@
 #
 ---
 name: validation_rules_without_groups
-description: All validation rules should belong to a validation rule group.
+description: Validation rules without a validation rule group
 section: Validation rules
 section_order: 1
 summary_sql: >-

From d29659c68fcbe5bd3cd3e85cc8baaf0f77e27a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Mon, 26 Jan 2026 11:10:39 +0100
Subject: [PATCH 08/15] fix: Update code

---
 .../categories/categories_same_category_options.yaml            | 2 +-
 .../categories/category_option_combos_have_duplicates.yaml      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
index 55ba307bcad0..813aade7cd06 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
@@ -32,7 +32,7 @@
   summary_sql: >-
     WITH duplicative_categories  AS (
     SELECT catoptions, COUNT(*) as count
-    FROM ( SELECT categoryid,
+    FROM (SELECT categoryid,
     array_agg(categoryoptionid ORDER BY categoryoptionid) as catoptions
     FROM categories_categoryoptions group by categoryid) as foo
     GROUP BY catoptions HAVING COUNT(*) > 1
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combos_have_duplicates.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combos_have_duplicates.yaml
index 97941a5cac4a..4c7941460135 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combos_have_duplicates.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/category_option_combos_have_duplicates.yaml
@@ -41,7 +41,6 @@ summary_sql: >-
   FROM categorycombos_optioncombos a
   RIGHT OUTER JOIN categoryoptioncombos_categoryoptions b on a.categoryoptioncomboid = b.categoryoptioncomboid
   ORDER BY a.categorycomboid,b.categoryoptionid
-  
   ) as x
   JOIN categorycombo cc on cc.categorycomboid = x.categorycomboid
   JOIN categoryoptioncombo coc on coc.categoryoptioncomboid = x.categoryoptioncomboid

From 63872fd6c2793a131923192c83e6e25e724fd39e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Mon, 26 Jan 2026 11:11:40 +0100
Subject: [PATCH 09/15] fix: Update code

---
 .../program_rules_no_action.yaml              | 14 ++++++-------
 .../program_rules_no_priority.yaml            | 12 +++++------
 .../users/users_with_no_user_role.yaml        | 20 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_action.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_action.yaml
index 732817c98a26..14d92828324f 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_action.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_action.yaml
@@ -37,13 +37,13 @@ summary_sql: >-
     100.0 * COUNT(*) / NULLIF( (SELECT COUNT(*) FROM programrule),0) as percent
     FROM program_rules_no_action;
 details_sql: >-
-     SELECT a.uid,a.name,NULL AS comment,
-     array_agg(COALESCE(b.name,'NULL') || ':' || COALESCE(b.uid,'NULL')) as refs  
-     from programrule a
-     LEFT OUTER JOIN program b on a.programid = b.programid
-     where programruleid
-     NOT IN (SELECT DISTINCT programruleid from programruleaction)
-     GROUP BY a.uid,a.name;
+    SELECT a.uid,a.name,NULL AS comment,
+    array_agg(COALESCE(b.name,'NULL') || ':' || COALESCE(b.uid,'NULL')) as refs  
+    from programrule a
+    LEFT OUTER JOIN program b on a.programid = b.programid
+    where programruleid
+    NOT IN (SELECT DISTINCT programruleid from programruleaction)
+    GROUP BY a.uid,a.name;
 details_id_type: programRules
 severity: SEVERE
 introduction: >
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_priority.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_priority.yaml
index c73e84cc5356..af37070896de 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_priority.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/program_rules/program_rules_no_priority.yaml
@@ -37,12 +37,12 @@ summary_sql: >-
     100.0 * COUNT(*) / NULLIF( (SELECT COUNT(*) FROM programrule),0) as percent
     FROM program_rules_no_priority;
 details_sql: >-
-     SELECT a.uid,a.name,NULL AS comment,
-     array_agg(COALESCE(b.name,'NULL') || ':' || COALESCE(b.uid,'NULL')) as refs  
-     from programrule a
-     LEFT OUTER JOIN program b on a.programid = b.programid
-     where priority IS NULL
-     GROUP BY a.uid,a.name;
+    SELECT a.uid,a.name,NULL AS comment,
+    array_agg(COALESCE(b.name,'NULL') || ':' || COALESCE(b.uid,'NULL')) as refs  
+    from programrule a
+    LEFT OUTER JOIN program b on a.programid = b.programid
+    where priority IS NULL
+    GROUP BY a.uid,a.name;
 details_id_type: programRules
 severity: WARNING
 introduction: >
diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_no_user_role.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_no_user_role.yaml
index 9afd009a992c..cb2843cbba3a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_no_user_role.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/users/users_with_no_user_role.yaml
@@ -30,21 +30,21 @@ description: Users without user roles
 section: Users
 section_order: 3
 summary_sql: >-
-  SELECT COUNT(*) as value,
+    SELECT COUNT(*) as value,
     100.0 * COUNT(*) / NULLIF((SELECT COUNT(*) FROM userinfo), 0) as percent
     FROM userinfo
     WHERE userinfoid NOT IN (SELECT DISTINCT userid FROM userrolemembers);
 details_sql: >
-  SELECT uid, 
-  username as name,
-  'disabled:' || disabled as comment
-  from userinfo
-  WHERE userinfoid NOT IN (SELECT DISTINCT userid FROM userrolemembers);
+    SELECT uid, 
+    username as name,
+    'disabled:' || disabled as comment
+    from userinfo
+    WHERE userinfoid NOT IN (SELECT DISTINCT userid FROM userrolemembers);
 details_id_type: users
 severity: SEVERE
 introduction: >
-  All users should have at least one use role associated with their account. If a user does not have a role, 
-  they will not be able to perform any actions in the system.
+    All users should have at least one use role associated with their account. If a user does not have a role, 
+    they will not be able to perform any actions in the system.
 recommendation: >
-  Using the list of users provided by the details query, either assign a user role or roles to the user
-  or alternatively, delete the user if they are no longer active in the system.
\ No newline at end of file
+    Using the list of users provided by the details query, either assign a user role or roles to the user
+    or alternatively, delete the user if they are no longer active in the system.
\ No newline at end of file

From 7dd3f111a64a733e5285afeba475f8e6008b4416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Mon, 26 Jan 2026 11:48:56 +0100
Subject: [PATCH 10/15] fix: Update code

---
 .../categories/categories_same_category_options.yaml         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
index 813aade7cd06..0aa55428176a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
@@ -38,11 +38,12 @@
     GROUP BY catoptions HAVING COUNT(*) > 1
     )
     SELECT COUNT(*) as value,
-     100.0 * COUNT(*) / NULLIF( (SELECT COUNT(*)
+    100.0 * COUNT(*) / NULLIF( (SELECT COUNT(*)
     FROM category),0 ) percent
     FROM duplicative_categories;
   details_sql: >-
-    SELECT x.uid,'(' || b.rank || ') ' || x.name as name  from category x
+    SELECT x.uid,'(' || b.rank || ') ' || x.name as name 
+	FROM category x
     INNER JOIN (
     SELECT categoryid, array_agg(categoryoptionid ORDER BY categoryoptionid) as catoptions
     from categories_categoryoptions GROUP BY categoryid

From 5321f8e78d91297b180ae578fba8f8c910f1ca15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Wed, 28 Jan 2026 10:48:20 +0100
Subject: [PATCH 11/15] fix: Update code

---
 dhis-2/dhis-api/pom.xml                                  | 1 -
 dhis-2/dhis-services/dhis-service-core/pom.xml           | 1 -
 dhis-2/dhis-support/dhis-support-external/pom.xml        | 1 -
 .../dhis/tracker/imports/job/NotificationSenderTest.java | 7 -------
 .../dhis/webapi/controller/ConfigurationController.java  | 9 ++++-----
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/dhis-2/dhis-api/pom.xml b/dhis-2/dhis-api/pom.xml
index a9c81a949b57..865adb05c728 100644
--- a/dhis-2/dhis-api/pom.xml
+++ b/dhis-2/dhis-api/pom.xml
@@ -149,7 +149,6 @@
     <dependency>
       <groupId>net.sourceforge.javacsv</groupId>
       <artifactId>javacsv</artifactId>
-      <version>${javacsv.version}</version>
     </dependency>
 
     <!-- SMPP -->
diff --git a/dhis-2/dhis-services/dhis-service-core/pom.xml b/dhis-2/dhis-services/dhis-service-core/pom.xml
index 87bd88033f9b..7f233e6d2b57 100644
--- a/dhis-2/dhis-services/dhis-service-core/pom.xml
+++ b/dhis-2/dhis-services/dhis-service-core/pom.xml
@@ -181,7 +181,6 @@
     <dependency>
       <groupId>net.sourceforge.javacsv</groupId>
       <artifactId>javacsv</artifactId>
-      <version>${javacsv.version}</version>
     </dependency>
     <dependency>
       <groupId>jakarta.persistence</groupId>
diff --git a/dhis-2/dhis-support/dhis-support-external/pom.xml b/dhis-2/dhis-support/dhis-support-external/pom.xml
index e5af5bb9ddf6..cfca08462b6e 100644
--- a/dhis-2/dhis-support/dhis-support-external/pom.xml
+++ b/dhis-2/dhis-support/dhis-support-external/pom.xml
@@ -98,7 +98,6 @@
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>${jsr305.version}</version>
     </dependency>
 
     <!-- Test -->
diff --git a/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/job/NotificationSenderTest.java b/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/job/NotificationSenderTest.java
index dea3a07816ef..2f2456aae511 100644
--- a/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/job/NotificationSenderTest.java
+++ b/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/job/NotificationSenderTest.java
@@ -314,13 +314,6 @@ private Enrollment enrollment() {
     return enrollment;
   }
 
-  private Enrollment enrollment(Program program) {
-    Enrollment enrollment = new Enrollment();
-    enrollment.setUid(ENROLLMENT_UID);
-    enrollment.setProgram(program);
-    return enrollment;
-  }
-
   private TrackerEvent event() {
     Program program = new Program();
     program.setProgramType(ProgramType.WITH_REGISTRATION);
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java
index 27783e0ce214..4348bbb081f3 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java
@@ -45,7 +45,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.UUID;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.hisp.dhis.appmanager.AppManager;
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.IdentifiableObjectManager;
@@ -492,7 +492,6 @@ public void setCorsWhitelist(@RequestBody String input) throws IOException {
         .collect(toCollection(LinkedHashSet::new));
   }
 
-  @SuppressWarnings("unchecked")
   @RequiresAuthority(anyOf = F_SYSTEM_SETTING)
   @PostMapping(
       value = {"/dataOutputPeriodTypes"},
@@ -501,7 +500,7 @@ public void setCorsWhitelist(@RequestBody String input) throws IOException {
   public void setDataOutputPeriodTypes(
       @RequestBody Set<org.hisp.dhis.webapi.webdomain.PeriodType> periodTypes) {
 
-    // Disallow deprecated type.
+    // Disallow deprecated types
     for (org.hisp.dhis.webapi.webdomain.PeriodType p : periodTypes) {
       if (trimToEmpty(p.getName()).equalsIgnoreCase(TWO_YEARLY.getName())) {
         throw new IllegalQueryException(new ErrorMessage(E1101, p.getName()));
@@ -513,7 +512,7 @@ public void setDataOutputPeriodTypes(
     periodTypes.forEach(
         p -> addIgnoreNull(periodTypesParsed, periodService.getPeriodTypeByName(p.getName())));
 
-    // Always add yearly, as it's mandatory for partition checks.
+    // Always add yearly, as it is mandatory for partition checks
     periodTypesParsed.add(periodService.getPeriodTypeByName(YEARLY.getName()));
 
     Configuration configuration = configurationService.getConfiguration();
@@ -548,6 +547,6 @@ public record TwoFactorMethods(
    * @return a trimmed string.
    */
   private String trim(String string) {
-    return StringUtils.remove(string, "\"");
+    return Strings.CS.remove(string, "\"");
   }
 }

From c49fd15027718114d83e9a58daec40e30243f1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Wed, 28 Jan 2026 13:32:01 +0100
Subject: [PATCH 12/15] fix: Update code

---
 .../categories/categories_same_category_options.yaml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
index 0aa55428176a..d4c9e5c6043a 100644
--- a/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
+++ b/dhis-2/dhis-services/dhis-service-administration/src/main/resources/data-integrity-checks/categories/categories_same_category_options.yaml
@@ -43,7 +43,7 @@
     FROM duplicative_categories;
   details_sql: >-
     SELECT x.uid,'(' || b.rank || ') ' || x.name as name 
-	FROM category x
+    FROM category x
     INNER JOIN (
     SELECT categoryid, array_agg(categoryoptionid ORDER BY categoryoptionid) as catoptions
     from categories_categoryoptions GROUP BY categoryid

From c8f56afb197f50021301a259d8925a7c37059e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Wed, 28 Jan 2026 13:33:03 +0100
Subject: [PATCH 13/15] fix: Update code

---
 .../java/org/hisp/dhis/validation/DataValidationRunnerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/validation/DataValidationRunnerTest.java b/dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/validation/DataValidationRunnerTest.java
index 7de5851068ec..813c184ff4d7 100644
--- a/dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/validation/DataValidationRunnerTest.java
+++ b/dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/validation/DataValidationRunnerTest.java
@@ -262,7 +262,7 @@ private PeriodTypeExtended createPeriodTypeExtended(
 
   private OrganisationUnit createOu(char uniqueCharacter) {
     OrganisationUnit organisationUnit = createOrganisationUnit(uniqueCharacter);
-    organisationUnit.setId(RandomUtils.nextLong());
+    organisationUnit.setId(RandomUtils.secure().randomLong());
     return organisationUnit;
   }
 }

From c47563d16bdd06306227fbcd2f3c83f1743117e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Wed, 4 Feb 2026 09:16:23 +0100
Subject: [PATCH 14/15] fix: Update code

---
 .../src/main/java/org/hisp/dhis/common/BaseNameableObject.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java
index 890cf29373d5..dfcd01bf932a 100644
--- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java
+++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java
@@ -50,6 +50,7 @@ public class BaseNameableObject extends BaseIdentifiableObject implements Nameab
   /** Description of this object. */
   protected String description;
 
+  /** Name to be displayed in data entry forms. */
   protected String formName;
 
   // -------------------------------------------------------------------------

From b567fa5c182df6a2d7c66acef2942975012c1046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Mon, 16 Mar 2026 11:37:47 +0100
Subject: [PATCH 15/15] fix: Update code

---
 .../java/org/hisp/dhis/calendar/DefaultCalendarService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java
index 7176a7e8c91b..96d210f51f93 100644
--- a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java
+++ b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java
@@ -59,7 +59,7 @@ public class DefaultCalendarService implements CalendarService {
   private final Map<String, Calendar> calendarMap = Maps.newHashMap();
 
   private static final List<DateFormat> DATE_FORMATS =
-      Lists.newArrayList(
+      List.of(
           new DateFormat("yyyy-MM-dd", "yyyy-MM-dd", "yyyy-MM-dd", "yyyy-mm-dd"),
           new DateFormat("dd-MM-yyyy", "dd-MM-yyyy", "dd-MM-yyyy", "dd-mm-yyyy"));