Merge remote-tracking branch 'origin/master' into hv/feat/DHIS2-18017… #10405

Job	Run time
setup-matrix	8s
install	25s
unit-tests	33s
lint	1m 15s
flow	48s
instance-version	2s
build	1m 56s
cypress-dev (1, cypress/e2e/AllAccessibleRecordsPage/AllAccessibleRecordsPage.feature, cypress/e2...	21s
cypress-dev (2, cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventP...	21s
cypress-dev (3, cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageNavigation/EnrollmentAdd...	24s
cypress-dev (4, cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.feat...	18s
cypress-dev (5, cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEve...	18s
release	36s
	7m 25s

Provide feedback