[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2022: Error solving in dashboard merging