Merging qtdevel2 branch -r10565:10849. This adds a lot of fixes and capabilities...