Merge "Custom snapshot capture and reconstitution." into lmp-dev