DO NOT MERGE: Issue 2106: Live Preview Snapshot

This is a PR for issue #2106.
Ah, old habits die hard. Totally agreed. Fixed.