Merge pull request #120882 from AdriaandeJongh/always-edit-now-after-create