release/v2.1.0

Merging changes to release branch back into `develop`.