DPC-268 - respond with 'no data' when no data
Merge branch 'tj/DPC-268' into 'next'

Tj/dpc 268