Merge pull request #1283 from akoshelev/hybrid-query-type #4852

Job	Run time
Measure coverage	15m 43s
Additional Builds and Concurrency Tests	11m 3s
Basic Checks	15m 6s
Release builds and tests	11m 13s
sanitize (address)	11m 59s
miri	3m 44s
sanitize (address, multi-threading)	11m 41s
sanitize (leak)	5m 42s
Slow tests	6m 13s
sanitize (leak, multi-threading)	7m 11s
	1h 39m 35s

Provide feedback