Score optimizations.
Merge branch 'dev' into dev-nogyp