Merge "Protect against monkey crash" into nyc-dev