Can you create a separate pull request? Wedge, Circle and Annulus should really separate as what's in this pull request is significant enough.