Re #7226. Cast the net wider.
Merge branch 'feature/7226_qtassistant_build_order' into develop