Gpii 947

http://issues.gpii.net/browse/GPII-947
we should see if there is something we can use from the PMT/PCP for this.