Comment 10 for bug 1750915

I'd agree with Liam's analysis - if we want to get a release out in the short-term, we'll need to go with 1) for now and work towards 2) over the next cycle; its a common pattern so needs careful design and implementation so not one to try and squeeze in after feature freeze.