Fix for supporting context with datadriven descriptors
Renaming demo file
Fixing reporting issue for data driven
Merge branch 'dataDriven'