Fix bugs. The bug link Jira VPS-19.
Merge branch 'wzp-local'