Fix bugs VPS-36 & VPS-39
Merge branch 'masterwzp'