Merge branch 'release/0.12.5' into develop
Able to making plural server-procs
Roll cherly version 0.12.6
Merge branch 'release/0.12.6'