Today
merge cherrypick_queryvisjobs_optimizations to main