Fix bugs VPS-38
Merge branch 'masterwzp'