DO NOT MERGE: Issue 2106: Live Preview Snapshot

This is a PR for issue #2106.
Ahhhh i've missed the difference in the header, my bad, sorry about that!