Merge "Adding workaround for crash." into nyc-dev