2.1 Label scan support for new planner [DONT MERGE, Waiting for fix on master]