Resolved conflicts cherry picking from Reclaim Philly