Issue #24745:improve editing for valid data
Merge pull request #537 from garyhgohoos/24745

Issue #24745:improve editing for valid data