tweaks to handle the source object
Merge branch 'dev'