Added data source method that allows the provision of custom context for
data source editing.
Merge remote-tracking branch 'origin/development'