Version 1 of #3462

and others

If others can still participate, it’s not really a grace period.