Originally raised via Jira: https://hdruk.atlassian.net/browse/SUPP-326
Raised here on behalf of: SV
Update to use PIDs