Pass the edit context when returning the create or update response. Fixes #661

Fixes #661