Apptimize to 2.1.0
Merge pull request #9825 from DHowett/master

Apptimize to 2.1.0