Push pdxcat changes to upstream