Avoid unnecessary conversions.
Merge branch 'develop'