Issue #24745:improve editing for valid data