Merge pull request #274 from jgperrin/fix/226-dataproduct-deprecated-v3.1.0