Merge "Fix potential crash loop" into nyc-dev