This is !6 (closed) but rebased + pushed to the mr799 branch so that CI runs in the tezos organization.
mr799
tezos