Merge "MAP MCE Kitchen Sink" into nyc-car-dev