Merge "Protect against work conditional crash" into nyc-mr1-dev