Fix loading of demo.sve file under ALL circumstances.  This belongs in standard.
Merge branch 'ncn-devel' into merge-from-standard