PDIO-203 Cut down on binary release size