DO NOT MERGE: Issue 2106: Live Preview Snapshot

This is a PR for issue #2106.
(I know, this was already there!). No magic numbers please =)