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