Updated data files and CDSTest for the demo
Merge remote-tracking branch 'origin/develop' into develop