Happy to report that this will also be natively supported in v41
https://dhis2.atlassian.net/browse/DHIS2-14272