Fixing PDIO-418
Fixing merge