Fixed
Merge branch '1793-auto-enable-qt' into develop
Merge branch 'develop' into test