Added support for the new datawell 3 PIDs
Resolved merge conflict
Merge branch 'datawell-3' into development