Issue #394, #407 - Prevent "Mark has been invalidated"
Sample: New image URLs