New: Sanity check on upload data.
Merge branch 'development'