Complete merge prod version into develop
Merge branch 'develop' of github:nacid/nCore into develop