Depends on D4885
With this diff, I restructured previously added code so it'll be easier to understand what comes next.
backup still builds
rebase
CI