Updating conversion methods for collection classes.
Merge branch 'refs/heads/develop'