Merge pull request #2237 from henghonglee/issue-2189-score-params