issue #19797: Fix bugs along the way
issue #19797: We have to be specific about which attribute controls edit behavior.
Merge