Merge "Organize intelligence counters together" into qt-dev