Re #7328 Add query info
Merge remote branch 'origin/feature/7328_start_stop_query'