Eng 4944 snapshot progress

There is a PRO pull request as well associated with it also.