Ensure steady score increase between v3.0 and v3.1

[camillobruni]

For HW developer / external folks it's nice if the score doesn't change too much between releases. After merging all score-changing changes back to v3.1 we should do a thorough measurement round and potentially adjust the score calculation so we don't have a score decrease with the new version.