Apptimize to 2.0.0
Merge pull request #9433 from DHowett/master

Apptimize to 2.0.0