Bring the "claim" feature for flags back

Thank you thank you thank you! Will be back asap with feedback!