PDIO-186 Upgrade to current release