Merge "Another guts redesign" into qt-dev