Merge "Fix string equality comparison" into nyc-dev