Can you reorganize your repo-layout to use the "forest extension"? I did not test this, but it is supposed to do what you need. Regards, Marko