Targeted feathers fixes (#24788)