Intermediate commit for Query Component