[service] - let xforms handle data manipulation.
Merge origin/develop into develop