Changes after review.
Merge branch 'dataSources' into viewer