Fixes #5202: Demo data is deprecated
Merge pull request #683 from fanf/bug_5202/demo_data_is_deprecated

Fixes #5202: Demo data is deprecated