Fix for #185
Run ConvertDataToSource before ConvertSourceToObject
Merge branch 'pr/186' into develop