Merge "Don't use noteop for preflight checks" into qt-dev