Snapshot SR15b2 - fixed snapshot bugs

fixed bugs in SR15b1