SCAL-329: working snapshot