AI-406 : introduced score source to avoid crappy code
Merge remote-tracking branch 'origin/version3' into version3