Merge "Removing hardcoded database column name" into nyc-dev