[PATCH 0/2] A couple of migration blocker query patches