Merge "Condition cleanup." into nyc-dev