Add a filter to build_query_vars_from_query_block
#43590
Merged
build_query_vars_from_query_block
#43590