Fix for supporting context with datadriven descriptors

Fix for supporting context with datadriven descriptors
Fixing reporting issue for data driven