This fix is only needed for a fresh 2.8.0 setup, older versions and upgrades to current do not need this (can be applied as idempotent update). fixes #5947