[XAPID-377] Added fix for processing snapshot
5 files changed