Milestone to track the refactoring effort on v1.1.1. Once this is complete, we'll release v1.2.0

See this issue for details on this work:
#856