Can have non-defined DSs again.
Stripping out duplicate extensions.
Merge pull request #568 from willtp87/7.x.add_datastream_fix

Can have non-defined DSs again.