Follows up https://github.com/piwik/piwik/issues/8689 Some work was done in https://github.com/piwik/piwik/pull/9858 and can be re-used. We need help for this one, if someone is keen to carry on the work... :8ball: