Merge "resolve merge conflicts of a13fc7f314ac56e75eca09c94db8090f928023ff to qt-qpr1-dev" into qt-qpr1-dev