trim all returning data
Merge branch 'dev'

trim all returning data