Add Exclude on Update

[msharp9]

This addresses:

#1725

It looks like @yajo suggested solution was a bit more involved, but I had already started this, and just thought to share.

[yajo]

Thanks for sharing! I like it because it is more scoped and straightforward. However I think the solution from #1733 covers more cases with about the same effort.

I'll keep this one open until we see how that one progresses, and close it later if I decide to merge #1733 finally.

Regards.