Adjust condition tag with test_bulkProcessing_data22 and test_drawProcessing_data23
Follow up to !72990 (merged) and !72914 (merged)
Some updates didn't make it in the sweep into main
Follow up to !72990 (merged) and !72914 (merged)
Some updates didn't make it in the sweep into main