Merge "Fix int to bool conversion warning" into nyc-dev