Merge "More APF debuggability." into nyc-dev