Hotfix: StopWatch is not available in prod.
Merge branch 'hotfix/0.2.1'