Merge "Make dump-jar filtering faster" into main