added safe snapshot restore
removed whitespace
Merge branch 'master' into ENG-4917