Merge branch 'zset_score'