Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
The PR goes part way to addressing the issues raised in this Lab ticket.
Before
The issues are succinctly summarised in the OP and in this comment:
After
Comments
I have not tested the results of this PR in all possible scenarios but offer it as an improvement on the status quo and a basis for further refinement. I have liberally commented the code in case the changes affect other workflows, e.g. #18586, #18488, #13534 and others I've probably missed.
Not addressed
There is also the question of what happens when, say, an Email field is cleared... is the intent to delete the Email record, or should the record remain as is currently the case?