Builds upon !793 (closed) and !792 (merged)
@v.friese @f.uhlig @p.-a.loizeau
On edit: Supercedes !793 (closed)