Fix bugs VPS-36 and temp save..
Merge branch 'masterwzp'