Merge remote-tracking branch 'remotes/afaerber/tags/qtest-for-2.3' into staging