Merge of latest Qt work with v3_Beta

:)