Issue #394, #407 - Prevent "Mark has been invalidated"
Sample: New image URLs
Sample: Built the latest snapshot
Merge remote-tracking branch 'clone/master'