Merge "Merge "Another guts redesign" into qt-dev am: 69ca6f531e am: 8065b7f518"