Merge "Break the debug cycle!" into nyc-dev