Good news, @riking’s refactor was just merged in. Super keen to know how it improves the experience for you and your users.
Also regarding this messed up rebuild when you are on pg 10, do you have a dedicated topic for it? I want to get rebuild working about for you ASAP, even if you have to wait a few days for @Falco to come up with a manual process for PG upgrade which involves less free disk space