Merge branch 'hotfix-2.0.1'
Merge branch 'development'
Modify method modifyRank to check whether the value must be inserted into database as NULL
Merge branch 'hotfix-2.0.2' into development