Merge branch 'DHIS2-18018' into DHIS2-17853 #10623

Job	Run time
setup-matrix	8s
install	23s
unit-tests	30s
lint	1m 0s
flow	51s
instance-version	2s
build	1m 59s
cypress-dev (1, cypress/e2e/AllAccessibleRecordsPage/AllAccessibleRecordsPage.feature, cypress/e2...	11m 4s
cypress-dev (2, cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventP...	9m 1s
cypress-dev (3, cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageNavigation/EnrollmentAdd...	14m 21s
cypress-dev (4, cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.feat...	10m 20s
cypress-dev (5, cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEve...	11m 0s
release	36s
	1h 1m 15s

Provide feedback