I would add that the six sector tables actually spent a good deal of time talking about the issues you've raised, and there are a number of recommendations in there. In terms of upscaling, it really needs to be done on a sectoral basis.
On November 19th, 2018. See this statement in context.