Merge "APF: add debug code." into nyc-dev