[v9_11] Resolve "_wait_for_rcode adds extraneous query"

Merged Michał Kępień requested to merge 1479-_wait_for_rcode-adds-extraneous-query-v9_11 into v9_11

(cherry picked from commit 0ee0580f)

Merge request reports