Update to v21 of Support Annotations