This is big and I used the fully automated procedure for it. No manual tweaking anywhere. We don't really care about the qt interface at this stage, we probably want to ditch it down the road. In order to limit any merge conflict once we cbranch, I'm just formatting everything.