Describe the solution you'd like

Merge release/2.1.0 branch into master

Describe alternatives you've considered

n/a

Additional context

Preparation for the 2.1.0 release.