This commit was originally merged in #7228 but reverted in #7254 as the associated sytest was not ready yet. Now that it is, we can merge this again.
This reverts commit 59f0ca8b87.
59f0ca8b87