ITI-1757: Fixes for snapshot creation
Merge pull request #32 from ticketscript/ITI-1757

ITI-1757: Fixes for snapshot creation