Merge "Use new API from PIEX" into nyc-dev