diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
new file mode 100644
index 000000000..e0702e703
--- /dev/null
+++ b/.github/workflows/build-docker.yml
@@ -0,0 +1,42 @@
+name: Create and publish a Docker image
+# https://docs.github.com/en/actions/publishing-packages/publishing-docker-images
+
+on:
+  push:
+    branches: ['dev', 'master', 'dev-flex']
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..4da74de30
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "dev", master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "dev" ]
+  schedule:
+    - cron: '22 22 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java', 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3054ca7d5..1e68803fd 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -4,7 +4,10 @@ on: [push, pull_request]
 
 jobs:
   build:
-
+    env:
+      # Only deploy JARs to S3 (and run semantic release) on push to dev or master,
+      # or if the commit message includes the specified "label".
+      SAVE_JAR_TO_S3: ${{ github.event_name == 'push' && (github.ref_name == 'dev' || github.ref_name == 'master' || contains(github.event.head_commit.message, '[save-jar]')) }}
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -24,15 +27,16 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 19
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
-      # Install node 14 for running e2e tests (and for maven-semantic-release).
-      - name: Use Node.js 18.x
+          java-version: 19
+          distribution: 'temurin'
+      # Install node 20 for running e2e tests (and for maven-semantic-release).
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v1
         with:
-          node-version: 18.x
+          node-version: 20.x
       - name: Start MongoDB
         uses: supercharge/mongodb-github-action@1.3.0
         with:
@@ -64,10 +68,7 @@ jobs:
       - name: Setup GTFS+ directory (used during testing)
         run: mkdir /tmp/gtfsplus
       - name: Build with Maven (run unit tests)
-        run: mvn --no-transfer-progress package
-      - name: Restart MongoDB with fresh database (for e2e tests)
-        if: env.SHOULD_RUN_E2E == 'true'
-        run: ./scripts/restart-mongo-with-fresh-db.sh
+        run: mvn --no-transfer-progress -X package
       - name: Run e2e tests
         if: env.SHOULD_RUN_E2E == 'true'
         run: mvn test
@@ -97,15 +98,20 @@ jobs:
 
       # Run maven-semantic-release to potentially create a new release of datatools-server. The flag --skip-maven-deploy is
       # used to avoid deploying to maven central. So essentially, this just creates a release with a changelog on github.
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 20.x
       - name: Run maven-semantic-release
+        if: env.SAVE_JAR_TO_S3 == 'true'
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
         run: |
           semantic-release --prepare @conveyal/maven-semantic-release --publish @semantic-release/github,@conveyal/maven-semantic-release --verify-conditions @semantic-release/github,@conveyal/maven-semantic-release --verify-release @conveyal/maven-semantic-release --use-conveyal-workflow --dev-branch=dev --skip-maven-deploy
       # The git commands get the commit hash of the HEAD commit and the commit just before HEAD.
       - name: Prepare deploy artifacts
-        # Only deploy on push (pull_request will deploy a temp. merge commit. See #400.)
-        if: github.event_name == 'push'
+        if: env.SAVE_JAR_TO_S3 == 'true'
+        # (pull_request will deploy a temp. merge commit. See #400.)
         run: |
           # get branch name of current branch for use in jar name
           export BRANCH=$GITHUB_REF_SLUG
@@ -125,6 +131,6 @@ jobs:
           FIRST_JAR="${ALL_JARS[0]}"
           cp "$FIRST_JAR" "deploy/dt-latest-$BRANCH_CLEAN.jar"
       - name: Deploy to S3
-        if: github.event_name == 'push'
+        if: env.SAVE_JAR_TO_S3 == 'true'
         run: |
           aws s3 cp ./deploy s3://datatools-builds --recursive --acl public-read
diff --git a/.gitignore b/.gitignore
index b04d422d8..c4fe5d5ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ tmp/
 deploy/
 
 # Configurations
-configurations/*
+configurations/*.yml
 !configurations/default
 !configurations/test
 
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..a64eddcd4
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+# syntax=docker/dockerfile:1
+FROM maven:3.8.7-openjdk-18-slim
+
+COPY . /datatools
+
+# Build jar
+WORKDIR /datatools
+RUN mvn package -DskipTests
+RUN cp target/dt*.jar /datatools/
+RUN mv dt*.jar datatools-server.jar
+
+RUN mkdir -p /var/datatools_gtfs/gtfsplus
+
+# Launch server
+# This relies on a configuration volume and aws volume being present. See `docker-compose.yml`, or the example below
+# Try: docker run --publish 4000:4000 -v ~/config/:/config datatools-latest
+CMD ["java", "-XX:MaxRAMPercentage=95", "-jar", "datatools-server.jar", "/config/env.yml", "/config/server.yml"]
+EXPOSE 4000
\ No newline at end of file
diff --git a/README.md b/README.md
index 53620da17..3be63c313 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,18 @@
 # Transit Data Manager
 
-The core application for IBI Group's transit data tools suite.
+[![Join the chat at https://matrix.to/#/#transit-data-tools:gitter.im](https://badges.gitter.im/repo.png)](https://matrix.to/#/#transit-data-tools:gitter.im)
+
+The core application for IBI Group's TRANSIT-Data-Tools suite.
 
 ## Documentation
 
 View the [latest documentation](http://conveyal-data-tools.readthedocs.org/en/latest/) at ReadTheDocs.
 
-Note: `dev` branch docs can be found [here](http://conveyal-data-tools.readthedocs.org/en/dev/).
\ No newline at end of file
+Note: `dev` branch docs can be found [here](http://conveyal-data-tools.readthedocs.org/en/dev/).
+
+## Docker Image
+The easiest way to get `datatools-server` running is to use the provided `Dockerfile` and `docker-compose.yml`. The `docker-compose.yml` includes both database servers that are needed. Edit the supplied configurations in the `configurations` directory to ensure the server starts correctly. Once this is done running `docker-compose up` will start Datatools and all required database servers.
+
+## Getting in touch
+
+We have a Gitter [space](https://matrix.to/#/#transit-data-tools:gitter.im) for the full TRANSIT-Data-Tools project where you can post questions and comments.
diff --git a/configurations/default/env.yml.tmp b/configurations/default/env.yml.tmp
index 119b399a6..91e53f92b 100644
--- a/configurations/default/env.yml.tmp
+++ b/configurations/default/env.yml.tmp
@@ -12,8 +12,8 @@ DISABLE_AUTH: false
 OSM_VEX: http://localhost:1000
 SPARKPOST_KEY: your-sparkpost-key
 SPARKPOST_EMAIL: email@example.com
-GTFS_DATABASE_URL: jdbc:postgresql://localhost/catalogue
+GTFS_DATABASE_URL: jdbc:postgresql://localhost/catalogue # If running via docker, this is jdbc:postgresql://postgres/dmtest
 # GTFS_DATABASE_USER:
 # GTFS_DATABASE_PASSWORD:
-#MONGO_HOST: mongo-host:27017
+#MONGO_HOST: mongo-host:27017 # If running via docker, this is mongo:27017
 MONGO_DB_NAME: catalogue
diff --git a/configurations/default/server.yml.tmp b/configurations/default/server.yml.tmp
index 20edb3008..74b0b2338 100644
--- a/configurations/default/server.yml.tmp
+++ b/configurations/default/server.yml.tmp
@@ -8,6 +8,7 @@ application:
   notifications_enabled: false
   docs_url: http://conveyal-data-tools.readthedocs.org
   support_email: support@ibigroup.com
+  public_gtfs_contact_email: public-gtfs-support-email@yourdomain.com
   port: 4000
   data:
     gtfs: /tmp
@@ -17,6 +18,8 @@ application:
 modules:
   enterprise:
     enabled: false
+    # Setting this to true will upload all feeds to S3 instead of linking to their URL
+    prefer_s3_links: false
   editor:
     enabled: true
   deployment:
@@ -24,6 +27,8 @@ modules:
     ec2:
       enabled: false
       default_ami: ami-your-ami-id
+      tag_key: a-tag-key-to-add-to-all-instances
+      tag_value: a-tag-value-to-add-to-all-instances
     # Note: using a cloudfront URL for these download URLs will greatly
     # increase download/deploy speed.
     otp_download_url: https://optional-otp-repo.com
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..cc847068d
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3.8'
+services:
+  datatools-server:
+    build: ./
+    ports:
+      - "4000:4000"
+    volumes:
+      - type: bind
+        source: ./configurations/default/
+        target: /config
+      - type: bind
+        source: ~/.aws
+        target: /root/.aws
+    depends_on:
+      - mongo
+      - postgres
+  mongo:
+    image: mongo
+    restart: always
+  postgres:
+    environment:
+      POSTGRES_HOST_AUTH_METHOD: trust
+      POSTGRES_USER: root
+      POSTGRES_DB: dmtest
+    image: postgres
+    restart: always
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f9b95a751..a5ef5d82d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Using the latest version of geotools (e.g, 20) seems to cause issues with the shapefile
         plugin where the_geom for each feature is null. -->
-        <geotools.version>17.5</geotools.version>
-        <awsjavasdk.version>1.11.625</awsjavasdk.version>
+        <geotools.version>20.1</geotools.version>
+        <awsjavasdk.version>1.12.720</awsjavasdk.version>
     </properties>
     <build>
         <resources>
@@ -96,8 +96,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -163,10 +163,21 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
+                <configuration>
+                    <!-- This line is required to get this library, designed for older Java, to work with newer java. -->
+                    <argLine>
+                        --illegal-access=permit
+                    </argLine>
+                </configuration>
             </plugin>
         </plugins>
     </build>
     <repositories>
+        <!--  used for importing java projects from github -->
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
         <!-- Hack to force maven to check central first. Maven central is inherited from the superpom,
              but ends up at the end of the list. Though most of the time the artifact is in central,
              Maven tries to download from every other repository and fails before checking central.
@@ -197,11 +208,6 @@
                 <updatePolicy>always</updatePolicy>
             </snapshots>
         </repository>
-        <!--  used for importing java projects from github -->
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -222,7 +228,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.13</version>
         </dependency>
 
         <!-- Used to connect to and import legacy editor MapDBs -->
@@ -253,16 +259,20 @@
             <version>5.5.2</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.mobilitydata.gtfs-validator</groupId>
+            <artifactId>gtfs-validator-main</artifactId>
+            <version>6.0.0</version>
+        </dependency>
         <!-- Used for loading/fetching/validating/writing GTFS entities. gtfs-lib also provides access to:
          - commons-io - generic utilities
          - AWS S3 SDK - putting/getting objects into/out of S3.
          -->
         <dependency>
-            <groupId>com.github.conveyal</groupId>
+            <groupId>com.github.ibi-group</groupId>
             <artifactId>gtfs-lib</artifactId>
             <!-- Latest dev build on jitpack.io -->
-            <version>bdb76ee</version>
+            <version>a8a376c82b</version>
             <!-- Exclusions added in order to silence SLF4J warnings about multiple bindings:
                 http://www.slf4j.org/codes.html#multiple_bindings
             -->
@@ -278,15 +288,21 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver-sync</artifactId>
-            <version>4.0.5</version>
+            <version>4.0.6</version>
         </dependency>
 
         <!-- Miscellaneous utilities -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.0-jre</version>
+            <version>32.0.0-jre</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
 
         <!-- Note: Unless we are explicit with the jackson dependencies listed below, other versions included in other
         dependencies may cause conflicts. Specifically, there is an issue with the JsonAlias annotation (used in
@@ -434,6 +450,11 @@
             <artifactId>aws-java-sdk-sts</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.9</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/src/main/java/com/conveyal/datatools/common/utils/SparkUtils.java b/src/main/java/com/conveyal/datatools/common/utils/SparkUtils.java
index 522beca71..f6f08167e 100644
--- a/src/main/java/com/conveyal/datatools/common/utils/SparkUtils.java
+++ b/src/main/java/com/conveyal/datatools/common/utils/SparkUtils.java
@@ -53,9 +53,9 @@ public static HttpServletResponse downloadFile(File file, String filename, Reque
         if (file == null) logMessageAndHalt(req, 404, "File is null");
         HttpServletResponse raw = res.raw();
         raw.setContentType("application/octet-stream");
-        raw.setHeader("Content-Disposition", "attachment; filename=" + filename);
         // Override the gzip content encoding applied to standard API responses.
-        res.header("Content-Encoding", "identity");
+        raw.setHeader("Content-Encoding", "identity");
+        raw.setHeader("Content-Disposition", "attachment; filename=" + filename);
         try (
             FileInputStream fileInputStream = new FileInputStream(file);
             ServletOutputStream outputStream = raw.getOutputStream()
diff --git a/src/main/java/com/conveyal/datatools/editor/controllers/EditorLockController.java b/src/main/java/com/conveyal/datatools/editor/controllers/EditorLockController.java
index 61db70a55..507f59395 100644
--- a/src/main/java/com/conveyal/datatools/editor/controllers/EditorLockController.java
+++ b/src/main/java/com/conveyal/datatools/editor/controllers/EditorLockController.java
@@ -30,56 +30,87 @@ public class EditorLockController {
 
     private static final JsonManager<EditorLockController> json = new JsonManager<>(EditorLockController.class, JsonViews.UserInterface.class);
     private static final Logger LOG = LoggerFactory.getLogger(EditorLockController.class);
-    public static final Map<String, EditorSession> sessionsForFeedIds = new HashMap<>();
-    private static final long SESSION_LENGTH_IN_SECONDS = 10 * 60; // Ten minutes
+    private static final Map<String, EditorSession> sessionsForFeedIds = new HashMap<>();
+    private static final long SESSION_LENGTH_IN_SECONDS = 10 * 60L; // Ten minutes
 
+    /**
+     * Returns the current session based on the info provided.
+     */
+    public static EditorSession getCurrentSession(ParsedRequest req) {
+        return sessionsForFeedIds.get(req.getSessionKey());
+    }
+
+    /**
+     * Returns a session based on a feed id.
+     */
+    public static EditorSession getSession(String feedId) {
+        return sessionsForFeedIds.values().stream()
+            .filter(s -> s.feedId.equals(feedId))
+            .findFirst()
+            .orElse(null);
+    }
 
     private static String lockFeed (Request req, Response res) {
-        // FIXME: why is content type not being set in before()/after()?
-        res.type("application/json");
-        Auth0UserProfile userProfile = req.attribute("user");
-        String feedId = req.queryParams("feedId");
-        EditorSession currentSession = sessionsForFeedIds.get(feedId);
+        ParsedRequest parsedReq = new ParsedRequest(req);
+        EditorSession currentSession = getCurrentSession(parsedReq);
+        String email = parsedReq.userProfile.getEmail();
         if (currentSession == null) {
             // If there is no active session for the feed ID, create a new one, which allows only the current user +
             // session to edit.
-            // Create new session
-            String newSessionId = invalidateAndCreateNewSession(req);
-            EditorSession newEditorSession = new EditorSession(feedId, newSessionId, userProfile);
-            sessionsForFeedIds.put(feedId, newEditorSession);
-            LOG.info("Locking feed {} for editing session {} by user {}", feedId, newSessionId, userProfile.getEmail());
-            return formatJSON("Locking editor feed for user " + newEditorSession.userEmail,
-                    200,
-                    feedId,
-                    newSessionId);
+            return invalidateAndCreateNewSession(
+                parsedReq,
+                String.format("Locking feed for user %s on %s", email, parsedReq.itemToLock),
+                String.format("Locking feed %s for user %s on %s", parsedReq.feedId, email, parsedReq.itemToLock)
+            );
         }
 
-        long secondsSinceLastCheckIn = TimeUnit.MILLISECONDS.toSeconds  (System.currentTimeMillis() - currentSession.lastCheckIn);
-        long minutesSinceLastCheckIn = TimeUnit.SECONDS.toMinutes(secondsSinceLastCheckIn);
-        long minutesUntilExpiration = TimeUnit.SECONDS.toMinutes(SESSION_LENGTH_IN_SECONDS - secondsSinceLastCheckIn);
+        long secondsSinceLastCheckIn = currentSession.secondsSinceLastCheckIn();
         if (secondsSinceLastCheckIn > SESSION_LENGTH_IN_SECONDS) {
             // There is an active session, but the user with active session has not checked in for some time. Booting
             // the current session in favor of new session.
-            // Create new session
-            String newSessionId = invalidateAndCreateNewSession(req);
-            LOG.info("User {} (session ID: {}) has not maintained lock for {} minutes. Booting.", currentSession.userEmail, currentSession.sessionId, minutesSinceLastCheckIn);
-            EditorSession newEditorSession = new EditorSession(feedId, newSessionId, userProfile);
-            sessionsForFeedIds.put(feedId, newEditorSession);
-            return formatJSON("Locking editor feed for user " + newEditorSession.userEmail, 200, feedId, newSessionId);
-        } else if (!currentSession.userId.equals(userProfile.getUser_id())) {
+            long minutesSinceLastCheckIn = TimeUnit.SECONDS.toMinutes(secondsSinceLastCheckIn);
+            return invalidateAndCreateNewSession(
+                parsedReq,
+                String.format("Locking feed for user %s on %s", email, parsedReq.itemToLock),
+                String.format("User %s has not maintained lock for %d minutes. Booting", email, minutesSinceLastCheckIn)
+            );
+        } else if (!currentSession.userId.equals(parsedReq.userProfile.getUser_id())) {
             // If the session has not expired, and another user has the active session.
-            LOG.warn("Edit session {} for user {} in progress for feed {}. User {} not permitted to lock feed for {} minutes.", currentSession.sessionId, currentSession.userEmail, currentSession.feedId, userProfile.getEmail(), minutesUntilExpiration);
-            logMessageAndHalt(req, 400, getLockedFeedMessage(currentSession, minutesUntilExpiration));
+            LOG.warn(
+                "Edit session {} for user {} in progress for feed {}. User {} not permitted to lock feed for {} minutes.",
+                currentSession.sessionId,
+                currentSession.userEmail,
+                currentSession.feedId,
+                email,
+                currentSession.minutesUntilExpiration());
+            logMessageAndHalt(req, 400, getLockedFeedMessage(currentSession));
             return null;
         } else {
             String sessionId = req.session().id();
-            LOG.warn("User {} is editing feed {} in another session {}. Cannot create lock for session {}", userProfile.getEmail(), feedId, currentSession.sessionId, sessionId);
+            LOG.warn(
+                "User {} is editing feed {} in another session {}. Cannot create lock for session {}",
+                email,
+                parsedReq.feedId,
+                currentSession.sessionId,
+                sessionId
+            );
             logMessageAndHalt(req, 400, "Warning! You are editing this feed in another session/browser tab!");
             return null;
         }
     }
 
-    private static String getLockedFeedMessage(EditorSession session, long minutesUntilExpiration) {
+    private static String invalidateAndCreateNewSession(ParsedRequest req, String message, String logMessage) {
+        req.request.session().invalidate();
+        Session session = req.request.session(true);
+        String newSessionId = session.id();
+
+        EditorSession newEditorSession = new EditorSession(req.feedId, newSessionId, req.userProfile, req.itemToLock);
+        sessionsForFeedIds.put(req.getSessionKey(), newEditorSession);
+        LOG.info("{} (Session ID: {})", logMessage, newSessionId);
+        return formatSuccessJSON(message, req.feedId, newSessionId);
+    }
+
+    private static String getLockedFeedMessage(EditorSession session) {
         String timestamp = session.lastEdit > 0
                 ? SimpleDateFormat.getInstance().format(new Date(session.lastEdit))
                 : null;
@@ -88,89 +119,99 @@ private static String getLockedFeedMessage(EditorSession session, long minutesUn
                 "Warning! There is an editor session already in progress for user %s. " +
                         "Their session will expire after %d minutes of inactivity (%s).",
                 session.userEmail,
-                minutesUntilExpiration,
+                session.minutesUntilExpiration(),
                 lastEditMessage);
     }
 
-    private static String invalidateAndCreateNewSession(Request req) {
-        req.session().invalidate();
-        Session session = req.session(true);
-        String newSessionId = session.id();
-        return newSessionId;
-    }
-
-    private static String maintainLock(Request req, Response res) {
-        // FIXME: why is content type not being set in before()/after()?
-        res.type("application/json");
-        String sessionId = req.params("id");
-        String feedId = req.queryParams("feedId");
-        Auth0UserProfile userProfile = req.attribute("user");
-        EditorSession currentSession = sessionsForFeedIds.get(feedId);
+    public static boolean checkUserHasActiveSession(Request req, String sessionId, String email, EditorSession currentSession) {
         if (currentSession == null) {
             // If there is no current session to maintain, request that user reloads browser.
             LOG.warn("No active editor session to maintain {}.", sessionId);
             logMessageAndHalt(req, 400, "No active session for feedId. Please refresh your browser and try editing later.");
-            return null;
+            return false;
         } else if (!currentSession.sessionId.equals(sessionId)) {
-            long secondsSinceLastCheckIn = TimeUnit.MILLISECONDS.toSeconds  (System.currentTimeMillis() - currentSession.lastCheckIn);
-            long minutesUntilExpiration = TimeUnit.SECONDS.toMinutes(SESSION_LENGTH_IN_SECONDS - secondsSinceLastCheckIn);
             // If there is an active session but it doesn't match the session, someone else (or the current user) is
             // editing elsewhere. A user should only be trying to maintain a lock if it had an active session at one
             // point. If we get to this point, it is because the user's session has expired and some other session took
             // its place.
-            if (currentSession.userEmail.equals(userProfile.getEmail())) {
+            if (currentSession.userEmail.equals(email)) {
                 // If the new current session is held by this user, give them the option to evict the current session /
                 // unlock the feed.
-                LOG.warn("User {} already has an active editor session () for feed {}.", userProfile.getEmail(), currentSession.sessionId, currentSession.feedId);
+                LOG.warn("User {} already has an active editor session {} for feed {}.", email, currentSession.sessionId, currentSession.feedId);
                 logMessageAndHalt(req, 400, "Warning! You have an active editing session for this feed underway in a different browser tab.");
             } else {
-                LOG.warn("User {} attempted editor session for feed {} while active session underway for user {}.", userProfile.getEmail(), currentSession.feedId, currentSession.userEmail);
-                logMessageAndHalt(req, 400, getLockedFeedMessage(currentSession, minutesUntilExpiration));
+                LOG.warn("User {} attempted editor session for feed {} while active session underway for user {}.", email, currentSession.feedId, currentSession.userEmail);
+                logMessageAndHalt(req, 400, getLockedFeedMessage(currentSession));
             }
-            return null;
-        } else {
-            // Otherwise, the current session matches the session the user is attempting to maintain. Update the
+            return false;
+        }
+        return true;
+    }
+
+    private static String maintainLock(Request req, Response res) {
+        ParsedRequest parsedReq = new ParsedRequest(req);
+        EditorSession currentSession = getCurrentSession(parsedReq);
+        if (checkUserHasActiveSession(req, parsedReq.sessionId, parsedReq.userProfile.getEmail(), currentSession)) {
+            // If the current session matches the session the user is attempting to maintain. Update the
             // lastEdited time.
             currentSession.lastCheckIn = System.currentTimeMillis();
-//            LOG.info("Updating session {} check-in time to {} for user {}", currentSession.sessionId, currentSession.lastCheckIn, currentSession.userEmail);
-            return formatJSON("Updating time for user " + currentSession.userEmail, 200, feedId, null);
+            return formatSuccessJSON("Updating time for user " + currentSession.userEmail, parsedReq.feedId, null);
+        } else {
+            return null;
         }
     }
 
+    /**
+     * Normal path for deleting a feed lock.
+     */
     private static String deleteFeedLock(Request req, Response res) {
-        // FIXME: why is content type not being set in before()/after()?
-        res.type("application/json");
-        Auth0UserProfile userProfile = req.attribute("user");
-        String feedId = req.queryParams("feedId");
-        String sessionId = req.params("id");
-        EditorSession currentSession = sessionsForFeedIds.get(feedId);
+        return deleteFeedLockCore(req, req.attribute("user"));
+    }
+
+    /**
+     * Remove a feed lock when a browser calls sendBeacon() when closing/refreshing/navigating away from editor.
+     */
+    private static String deleteFeedLockBeacon(Request req, Response res) {
+        // The sendBeacon call does not contain any Authorization headers, so we just pass a null userProfile.
+        return deleteFeedLockCore(req, null);
+    }
+
+    private static String deleteFeedLockCore(Request req, Auth0UserProfile userProfile) {
+        ParsedRequest parsedReq = new ParsedRequest(req);
+        EditorSession currentSession = getCurrentSession(parsedReq);
         if (currentSession == null) {
             // If there is no current session to delete/overwrite, request that user reloads browser.
             LOG.warn("No active session to overwrite/delete.");
             return SparkUtils.formatJSON("No active session to take over. Please refresh your browser and try editing later.", 202);
-        } else if (!currentSession.sessionId.equals(sessionId)) {
+        } else if (!currentSession.sessionId.equals(parsedReq.sessionId)) {
             // If there is a different active session for some user, allow deletion / overwrite.
             // Note: There used to be a check here that the requesting user was the same as the user with an open
             // session; however, this has been removed because in practice it became a nuisance. Respectful users with
             // shared access to a feed can generally be trusted not to boot one another out in a combative manner.
-            boolean overwrite = Boolean.valueOf(req.queryParams("overwrite"));
-            if (overwrite) {
-                sessionId = invalidateAndCreateNewSession(req);
-                EditorSession newEditorSession = new EditorSession(feedId, sessionId, userProfile);
-                sessionsForFeedIds.put(feedId, newEditorSession);
-                LOG.warn("Previously active session {} has been overwritten with new session {}.", currentSession.sessionId, newEditorSession.sessionId);
-                return formatJSON("Previous session lock has been overwritten with new session.", 200, feedId, sessionId);
+            boolean overwrite = Boolean.parseBoolean(req.queryParams("overwrite"));
+            if (userProfile != null && overwrite) {
+                return invalidateAndCreateNewSession(
+                    parsedReq,
+                    "Previous session lock has been overwritten with new session.",
+                    String.format("Previously active session %s has been overwritten with new session.", currentSession.sessionId)
+                );
             } else {
                 LOG.warn("Not overwriting session {} for user {}.", currentSession.sessionId, currentSession.userEmail);
                 return SparkUtils.formatJSON("Not processing request to delete lock. There is already an active session for user " + currentSession.userEmail, 202);
             }
         } else {
-            LOG.info("Current session: {} {}; User session: {} {}", currentSession.userEmail, currentSession.sessionId, userProfile.getEmail(), sessionId);
+            LOG.info(
+                "Current session: {} {}; User session: {} {}",
+                currentSession.userEmail,
+                currentSession.sessionId,
+                userProfile != null ? userProfile.getEmail() : "(email unavailable)",
+                parsedReq.sessionId
+            );
             // Otherwise, the current session matches the session from which the delete request came. This indicates that
             // the user's editing session has been closed (by either exiting the editor or closing the browser tab).
             LOG.info("Closed session {} for feed {} successfully.", currentSession.sessionId, currentSession.feedId);
-            sessionsForFeedIds.remove(feedId);
-            return formatJSON("Session has been closed successfully.", 200, feedId, sessionId);
+            sessionsForFeedIds.remove(parsedReq.getSessionKey());
+            return formatSuccessJSON("Session has been closed successfully.", parsedReq.feedId, parsedReq.sessionId);
         }
     }
 
@@ -178,13 +219,16 @@ public static void register(String apiPrefix) {
         post(apiPrefix + "secure/lock", EditorLockController::lockFeed, json::write);
         delete(apiPrefix + "secure/lock/:id", EditorLockController::deleteFeedLock, json::write);
         put(apiPrefix + "secure/lock/:id", EditorLockController::maintainLock, json::write);
+        // Extra, unsecure POST method for removing lock via a browser's Navigator.sendBeacon() method.
+        // (Navigator.sendBeacon() sends a POST and does not support authorization headers.)
+        post(apiPrefix + "deletelock/:id", EditorLockController::deleteFeedLockBeacon, json::write);
     }
 
-    private static String formatJSON(String message, int code, String feedId, String sessionId) {
+    private static String formatSuccessJSON(String message, String feedId, String sessionId) {
         JsonObject object = new JsonObject();
-        object.addProperty("result", code >= 400 ? "ERR" : "OK");
+        object.addProperty("result", "OK");
         object.addProperty("message", message);
-        object.addProperty("code", code);
+        object.addProperty("code", 200);
         if (sessionId != null) {
             object.addProperty("sessionId", sessionId);
         }
@@ -199,13 +243,51 @@ public static class EditorSession {
         public final String userEmail;
         public long lastCheckIn;
         public long lastEdit;
+        public final String lockedItem;
 
-        EditorSession (String feedId, String sessionId, Auth0UserProfile userProfile) {
+        EditorSession (String feedId, String sessionId, Auth0UserProfile userProfile, String itemToLock) {
             this.feedId = feedId;
             this.sessionId = sessionId;
             this.userId = userProfile != null ? userProfile.getUser_id() : "no_user_id";
             this.userEmail = userProfile != null ? userProfile.getEmail() : "no_user_email";
-            lastCheckIn = System.currentTimeMillis();
+            this.lastCheckIn = System.currentTimeMillis();
+            this.lockedItem = itemToLock;
+        }
+
+        public long secondsSinceLastCheckIn() {
+            return TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - lastCheckIn);
+        }
+
+        public long minutesUntilExpiration() {
+            return TimeUnit.SECONDS.toMinutes(SESSION_LENGTH_IN_SECONDS - secondsSinceLastCheckIn());
+        }
+    }
+
+    /**
+     * Holds useful data from an editor lock request.
+     */
+    public static class ParsedRequest {
+        public final Request request;
+        public final Auth0UserProfile userProfile;
+        public final String feedId;
+        public final String itemToLock;
+        public final String sessionId;
+
+        public ParsedRequest(Request req) {
+            this.request = req;
+            this.userProfile = req.attribute("user");
+            this.feedId = req.queryParams("feedId");
+            this.itemToLock = req.queryParamOrDefault("item", "");
+            this.sessionId = req.params("id");
+        }
+
+        /**
+         * Returns a composite key made of:
+         * - a feed id that the lock affects,
+         * - an id of the item being locked by that user in a session.
+         */
+        public String getSessionKey() {
+            return String.format("%s-%s", feedId, itemToLock);
         }
     }
 }
diff --git a/src/main/java/com/conveyal/datatools/editor/controllers/api/EditorController.java b/src/main/java/com/conveyal/datatools/editor/controllers/api/EditorController.java
index ea73c0cdf..671466860 100644
--- a/src/main/java/com/conveyal/datatools/editor/controllers/api/EditorController.java
+++ b/src/main/java/com/conveyal/datatools/editor/controllers/api/EditorController.java
@@ -29,8 +29,10 @@
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -40,8 +42,8 @@
 import static com.conveyal.datatools.common.utils.SparkUtils.formatJSON;
 import static com.conveyal.datatools.common.utils.SparkUtils.getObjectNode;
 import static com.conveyal.datatools.common.utils.SparkUtils.logMessageAndHalt;
-import static com.conveyal.datatools.editor.controllers.EditorLockController.sessionsForFeedIds;
 import static com.conveyal.datatools.manager.controllers.api.UserController.inTestingEnvironment;
+import static org.eclipse.jetty.http.HttpStatus.OK_200;
 import static spark.Spark.delete;
 import static spark.Spark.options;
 import static spark.Spark.patch;
@@ -130,6 +132,10 @@ private void registerRoutes() {
             put(ROOT_ROUTE + ID_PARAM + "/stop_times", this::updateStopTimesFromPatternStops, json::write);
             delete(ROOT_ROUTE + ID_PARAM + "/trips", this::deleteTripsForPattern, json::write);
         }
+
+        if ("stop".equals(classToLowercase)) {
+            delete(ROOT_ROUTE + ID_PARAM + "/cascadeDeleteStop", this::cascadeDeleteStop, json::write);
+        }
     }
 
     /**
@@ -259,6 +265,81 @@ private String deleteTripsForPattern(Request req, Response res) {
         }
     }
 
+    /**
+     * HTTP endpoint to delete a stop and all references in stop times and pattern stops given a string stop_id (i.e. not
+     * the integer ID field). Then normalize the stop times for all updated patterns (i.e. the ones where the stop has
+     * been deleted).
+     */
+    private String cascadeDeleteStop(Request req, Response res) {
+        // Table writer closes the database connection after use, so a new one is required for each task.
+        JdbcTableWriter tableWriter;
+        long startTime = System.currentTimeMillis();
+        String namespace = getNamespaceAndValidateSession(req);
+        String stopIdColumnName = "stop_id";
+
+        // NOTE: This is a string stop ID, not the integer ID that other HTTP endpoints use.
+        String stopId = req.params("id");
+        if (stopId == null) {
+            logMessageAndHalt(req, 400, "Must provide a valid stopId.");
+        }
+
+        try (
+            Connection connection = datasource.getConnection();
+            PreparedStatement statement = connection.prepareStatement(
+                String.format("select id, stop_sequence from %s.pattern_stops where %s = ?", namespace, stopIdColumnName)
+            )
+        ) {
+            // Get the patterns to be normalized before the related stop is deleted.
+            statement.setString(1, stopId);
+            ResultSet resultSet = statement.executeQuery();
+            Map<Integer, Integer> patternsToBeNormalized = new HashMap<>();
+            while (resultSet.next()) {
+                patternsToBeNormalized.put(
+                    resultSet.getInt("id"),
+                    resultSet.getInt("stop_sequence")
+                );
+            }
+
+            tableWriter = new JdbcTableWriter(Table.STOP_TIMES, datasource, namespace);
+            int deletedCountStopTimes = tableWriter.deleteWhere(stopIdColumnName, stopId, true);
+
+            int deletedCountPatternStops = 0;
+            if (!patternsToBeNormalized.isEmpty()) {
+                tableWriter = new JdbcTableWriter(Table.PATTERN_STOP, datasource, namespace);
+                deletedCountPatternStops = tableWriter.deleteWhere(stopIdColumnName, stopId, true);
+                if (deletedCountPatternStops > 0) {
+                    for (Map.Entry<Integer, Integer> patternStop : patternsToBeNormalized.entrySet()) {
+                        tableWriter = new JdbcTableWriter(Table.PATTERN_STOP, datasource, namespace);
+                        int stopSequence = patternStop.getValue();
+                        // Begin with the stop prior to the one deleted, unless at the beginning.
+                        int beginWithSequence = (stopSequence != 0) ? stopSequence - 1 : stopSequence;
+                        tableWriter.normalizeStopTimesForPattern(patternStop.getKey(), beginWithSequence, false);
+                    }
+                }
+            }
+
+            tableWriter = new JdbcTableWriter(Table.STOPS, datasource, namespace);
+            int deletedCountStop = tableWriter.deleteWhere(stopIdColumnName, stopId, true);
+
+            return formatJSON(
+                String.format(
+                    "Deleted %d stop, %d pattern stops and %d stop times.",
+                    deletedCountStop,
+                    deletedCountPatternStops,
+                    deletedCountStopTimes),
+                OK_200
+            );
+        } catch (InvalidNamespaceException e) {
+            logMessageAndHalt(req, 400, "Invalid namespace.", e);
+            return null;
+        } catch (Exception e) {
+            logMessageAndHalt(req, 500, "Error deleting entity.", e);
+            return null;
+        } finally {
+            LOG.info("Cascade delete of stop operation took {} msec.", System.currentTimeMillis() - startTime);
+        }
+    }
+
     /**
      * Currently designed to delete multiple trips in a single transaction. Trip IDs should be comma-separated in a query
      * parameter. TODO: Implement this for other entity types?
@@ -325,8 +406,9 @@ private String updateStopTimesFromPatternStops (Request req, Response res) {
         int patternId = getIdFromRequest(req);
         try {
             int beginStopSequence = Integer.parseInt(req.queryParams("stopSequence"));
+            boolean interpolateStopTimes = Boolean.parseBoolean(req.queryParams("interpolateStopTimes"));
             JdbcTableWriter tableWriter = new JdbcTableWriter(table, datasource, namespace);
-            int stopTimesUpdated = tableWriter.normalizeStopTimesForPattern(patternId, beginStopSequence);
+            int stopTimesUpdated = tableWriter.normalizeStopTimesForPattern(patternId, beginStopSequence, interpolateStopTimes);
             return SparkUtils.formatJSON("updateResult", stopTimesUpdated + " stop times updated.");
         } catch (Exception e) {
             logMessageAndHalt(req, 400, "Error normalizing stop times", e);
@@ -394,7 +476,7 @@ private String createOrUpdate(Request req, Response res) {
             if (isCreating) {
                 return tableWriter.create(jsonBody, true);
             } else {
-                return tableWriter.update(id, jsonBody, true);
+                return update(tableWriter, id, jsonBody);
             }
         } catch (InvalidNamespaceException e) {
             logMessageAndHalt(req, 400, "Invalid namespace");
@@ -409,6 +491,30 @@ private String createOrUpdate(Request req, Response res) {
         return null;
     }
 
+    /**
+     * Handle specific entity updates.
+     */
+    private String update(JdbcTableWriter tableWriter, Integer id, String jsonBody) throws IOException, SQLException {
+        try {
+            return tableWriter.update(id, jsonBody, true);
+        } catch (SQLException e) {
+            if (table.name.equals(Table.TRIPS.name)) {
+                // If an exception is thrown updating a trip, provide additional information to help rectify the
+                // issue.
+                JsonNode trip = mapper.readTree(jsonBody);
+                throw new SQLException(
+                    String.format(
+                        "Trip id %s conflicts with an existing trip id.",
+                        trip.get("trip_id").asText()
+                    )
+                );
+            } else {
+                // Continue to pass the exception to the frontend.
+                throw e;
+            }
+        }
+    }
+
     /**
      * Get the namespace for the feed ID found in the request. Also, check that the user has an active editing session
      * for the provided feed ID.
@@ -425,21 +531,9 @@ private static String getNamespaceAndValidateSession(Request req) {
         // Only check for editing session if not in testing environment.
         // TODO: Add way to mock session.
         if (!inTestingEnvironment()) {
-            EditorLockController.EditorSession currentSession = sessionsForFeedIds.get(feedId);
-            if (currentSession == null) {
-                logMessageAndHalt(req, 400, "There is no active editing session for user.");
-            }
-            if (!currentSession.sessionId.equals(sessionId)) {
-                // This session does not match the current active session for the feed.
-                Auth0UserProfile userProfile = req.attribute("user");
-                if (currentSession.userEmail.equals(userProfile.getEmail())) {
-                    LOG.warn("User {} already has editor session {} for feed {}. Same user cannot make edits on session {}.", currentSession.userEmail, currentSession.sessionId, feedId, req.session().id());
-                    logMessageAndHalt(req, 400, "You have another editing session open for " + feedSource.name);
-                } else {
-                    LOG.warn("User {} already has editor session {} for feed {}. User {} cannot make edits on session {}.", currentSession.userEmail, currentSession.sessionId, feedId, userProfile.getEmail(), req.session().id());
-                    logMessageAndHalt(req, 400, "Somebody else is editing the " + feedSource.name + " feed.");
-                }
-            } else {
+            Auth0UserProfile userProfile = req.attribute("user");
+            EditorLockController.EditorSession currentSession = EditorLockController.getSession(feedId);
+            if (EditorLockController.checkUserHasActiveSession(req, sessionId, userProfile.getEmail(), currentSession)) {
                 currentSession.lastEdit = System.currentTimeMillis();
                 LOG.info("Updating session {} last edit time to {}", sessionId, currentSession.lastEdit);
             }
diff --git a/src/main/java/com/conveyal/datatools/editor/controllers/api/SnapshotController.java b/src/main/java/com/conveyal/datatools/editor/controllers/api/SnapshotController.java
index bce416e93..58d93fee9 100644
--- a/src/main/java/com/conveyal/datatools/editor/controllers/api/SnapshotController.java
+++ b/src/main/java/com/conveyal/datatools/editor/controllers/api/SnapshotController.java
@@ -63,6 +63,12 @@ private static Snapshot getSnapshotFromRequest(Request req) {
         return Persistence.snapshots.getById(id);
     }
 
+    private static boolean getPublishProprietaryFiles(Request req) {
+        return Boolean.parseBoolean(
+            req.queryParamOrDefault("publishProprietaryFiles", Boolean.FALSE.toString())
+        );
+    }
+
     /**
      * HTTP endpoint that returns the list of snapshots for a given feed source.
      */
@@ -84,6 +90,7 @@ private static String createSnapshot (Request req, Response res) throws IOExcept
         boolean publishNewVersion = Boolean.parseBoolean(
             req.queryParamOrDefault("publishNewVersion", Boolean.FALSE.toString())
         );
+        boolean publishProprietaryFiles = getPublishProprietaryFiles(req);
         FeedSource feedSource = FeedVersionController.requestFeedSourceById(req, Actions.EDIT, "feedId");
         // Take fields from request body for creating snapshot (i.e., feedId/feedSourceId, name, comment).
         Snapshot snapshot = json.read(req.body());
@@ -99,7 +106,7 @@ private static String createSnapshot (Request req, Response res) throws IOExcept
                 new CreateSnapshotJob(userProfile, snapshot, bufferIsEmpty, !bufferIsEmpty, false);
         // Add publish feed version job if specified by request.
         if (publishNewVersion) {
-            createSnapshotJob.addNextJob(new CreateFeedVersionFromSnapshotJob(feedSource, snapshot, userProfile));
+            createSnapshotJob.addNextJob(new CreateFeedVersionFromSnapshotJob(feedSource, snapshot, userProfile, publishProprietaryFiles));
         }
         // Begin asynchronous execution.
         JobUtils.heavyExecutor.execute(createSnapshotJob);
@@ -173,9 +180,10 @@ private static String restoreSnapshot (Request req, Response res) {
     private static String downloadSnapshotAsGTFS(Request req, Response res) {
         Auth0UserProfile userProfile = req.attribute("user");
         Snapshot snapshot = getSnapshotFromRequest(req);
+        boolean publishProprietaryFiles = getPublishProprietaryFiles(req);
         // Create and kick off export job.
         // FIXME: what if a snapshot is already written to S3?
-        ExportSnapshotToGTFSJob exportSnapshotToGTFSJob = new ExportSnapshotToGTFSJob(userProfile,  snapshot);
+        ExportSnapshotToGTFSJob exportSnapshotToGTFSJob = new ExportSnapshotToGTFSJob(userProfile, snapshot, publishProprietaryFiles);
         JobUtils.heavyExecutor.execute(exportSnapshotToGTFSJob);
         return formatJobMessage(exportSnapshotToGTFSJob.jobId, "Exporting snapshot to GTFS.");
     }
diff --git a/src/main/java/com/conveyal/datatools/editor/jobs/ExportSnapshotToGTFSJob.java b/src/main/java/com/conveyal/datatools/editor/jobs/ExportSnapshotToGTFSJob.java
index 3798c2ee8..fc76890b5 100644
--- a/src/main/java/com/conveyal/datatools/editor/jobs/ExportSnapshotToGTFSJob.java
+++ b/src/main/java/com/conveyal/datatools/editor/jobs/ExportSnapshotToGTFSJob.java
@@ -28,16 +28,18 @@ public class ExportSnapshotToGTFSJob extends MonitorableJob {
     private final Snapshot snapshot;
     private final FeedVersion feedVersion;
     private File tempFile;
+    private final boolean publishProprietaryFiles;
 
-    public ExportSnapshotToGTFSJob(Auth0UserProfile owner, Snapshot snapshot, FeedVersion feedVersion) {
+    public ExportSnapshotToGTFSJob(Auth0UserProfile owner, Snapshot snapshot, FeedVersion feedVersion, boolean publishProprietaryFiles) {
         super(owner, "Exporting snapshot " + snapshot.name, JobType.EXPORT_SNAPSHOT_TO_GTFS);
         this.snapshot = snapshot;
         this.feedVersion = feedVersion;
+        this.publishProprietaryFiles = publishProprietaryFiles;
         status.update("Starting database snapshot...", 10);
     }
 
-    public ExportSnapshotToGTFSJob(Auth0UserProfile owner, Snapshot snapshot) {
-        this(owner, snapshot, null);
+    public ExportSnapshotToGTFSJob(Auth0UserProfile owner, Snapshot snapshot, boolean publishProprietaryFiles) {
+        this(owner, snapshot, null, publishProprietaryFiles);
     }
 
     @JsonProperty
@@ -57,7 +59,7 @@ public void jobLogic() {
             status.fail("Error creating local file for snapshot.", e);
             return;
         }
-        JdbcGtfsExporter exporter = new JdbcGtfsExporter(snapshot.namespace, tempFile.getAbsolutePath(), DataManager.GTFS_DATA_SOURCE, true);
+        JdbcGtfsExporter exporter = new JdbcGtfsExporter(snapshot.namespace, tempFile.getAbsolutePath(), DataManager.GTFS_DATA_SOURCE, true, publishProprietaryFiles);
         FeedLoadResult result = exporter.exportTables();
         if (result.fatalException != null) {
             status.fail(String.format("Error (%s) encountered while exporting database tables.", result.fatalException));
diff --git a/src/main/java/com/conveyal/datatools/editor/utils/GeoUtils.java b/src/main/java/com/conveyal/datatools/editor/utils/GeoUtils.java
index 658564275..a7b3e0e48 100644
--- a/src/main/java/com/conveyal/datatools/editor/utils/GeoUtils.java
+++ b/src/main/java/com/conveyal/datatools/editor/utils/GeoUtils.java
@@ -1,11 +1,11 @@
 package com.conveyal.datatools.editor.utils;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Polygon;
 import org.geotools.referencing.GeodeticCalculator;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
 
 import java.awt.geom.Point2D;
 
diff --git a/src/main/java/com/conveyal/datatools/editor/utils/PolylineEncoder.java b/src/main/java/com/conveyal/datatools/editor/utils/PolylineEncoder.java
index 9072fd382..ed1f135a2 100755
--- a/src/main/java/com/conveyal/datatools/editor/utils/PolylineEncoder.java
+++ b/src/main/java/com/conveyal/datatools/editor/utils/PolylineEncoder.java
@@ -13,10 +13,12 @@ the License, or (at your option) any later version.
 
 package com.conveyal.datatools.editor.utils;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
+
+
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
 
 import java.util.AbstractList;
 import java.util.ArrayList;
diff --git a/src/main/java/com/conveyal/datatools/manager/controllers/DumpController.java b/src/main/java/com/conveyal/datatools/manager/controllers/DumpController.java
index b26dbcde0..28f4fec28 100644
--- a/src/main/java/com/conveyal/datatools/manager/controllers/DumpController.java
+++ b/src/main/java/com/conveyal/datatools/manager/controllers/DumpController.java
@@ -4,6 +4,7 @@
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
 import com.conveyal.datatools.manager.jobs.ProcessSingleFeedJob;
 import com.conveyal.datatools.manager.jobs.ValidateFeedJob;
+import com.conveyal.datatools.manager.jobs.ValidateMobilityDataFeedJob;
 import com.conveyal.datatools.manager.models.Deployment;
 import com.conveyal.datatools.manager.models.ExternalFeedSourceProperty;
 import com.conveyal.datatools.manager.models.FeedRetrievalMethod;
@@ -354,18 +355,17 @@ public static boolean validateAll (boolean load, boolean force, String filterFee
                 // If the force option is not true and the validation result did not fail, re-validate.
                 continue;
             }
-            MonitorableJob job;
             if (filterFeedId != null && !version.feedSourceId.equals(filterFeedId)) {
                 // Skip all feeds except Cortland for now.
                 continue;
             }
             Auth0UserProfile systemUser = Auth0UserProfile.createSystemUser();
             if (load) {
-                job = new ProcessSingleFeedJob(version, systemUser, false);
+                JobUtils.heavyExecutor.execute(new ProcessSingleFeedJob(version, systemUser, false));
             } else {
-                job = new ValidateFeedJob(version, systemUser, false);
+                JobUtils.heavyExecutor.execute(new ValidateFeedJob(version, systemUser, false));
+                JobUtils.heavyExecutor.execute(new ValidateMobilityDataFeedJob(version, systemUser, false));
             }
-            JobUtils.heavyExecutor.execute(job);
         }
         // ValidateAllFeedsJob validateAllFeedsJob = new ValidateAllFeedsJob("system", force, load);
         return true;
diff --git a/src/main/java/com/conveyal/datatools/manager/controllers/api/DeploymentController.java b/src/main/java/com/conveyal/datatools/manager/controllers/api/DeploymentController.java
index f5a1162f1..9d43a6616 100644
--- a/src/main/java/com/conveyal/datatools/manager/controllers/api/DeploymentController.java
+++ b/src/main/java/com/conveyal/datatools/manager/controllers/api/DeploymentController.java
@@ -1,6 +1,5 @@
 package com.conveyal.datatools.manager.controllers.api;
 
-import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.s3.AmazonS3URI;
 import com.amazonaws.services.s3.model.DeleteObjectRequest;
 import com.conveyal.datatools.common.status.MonitorableJob;
@@ -14,6 +13,7 @@
 import com.conveyal.datatools.manager.jobs.DeploymentGisExportJob;
 import com.conveyal.datatools.manager.jobs.PeliasUpdateJob;
 import com.conveyal.datatools.manager.models.Deployment;
+import com.conveyal.datatools.manager.models.DeploymentSummary;
 import com.conveyal.datatools.manager.models.EC2InstanceSummary;
 import com.conveyal.datatools.manager.models.FeedDownloadToken;
 import com.conveyal.datatools.manager.models.FeedSource;
@@ -233,6 +233,19 @@ private static Collection<Deployment> getAllDeployments (Request req, Response r
         }
     }
 
+    private static Collection<DeploymentSummary> getAllDeploymentSummaries(Request req, Response res) {
+        Auth0UserProfile userProfile = req.attribute("user");
+        String projectId = req.queryParams("projectId");
+        Project project = Persistence.projects.getById(projectId);
+        if (project == null) {
+            logMessageAndHalt(req, 400, "Must provide valid projectId value.");
+        }
+        if (!userProfile.canAdministerProject(project)) {
+            logMessageAndHalt(req, 401, "User not authorized to view project deployments.");
+        }
+        return project.retrieveDeploymentSummaries();
+    }
+
     /**
      * Create a new deployment for the project. All feed sources with a valid latest version are added to the new
      * deployment.
@@ -594,6 +607,7 @@ public static void register (String apiPrefix) {
         get(apiPrefix + "secure/deployments/:id", DeploymentController::getDeployment, fullJson::write);
         delete(apiPrefix + "secure/deployments/:id", DeploymentController::deleteDeployment, fullJson::write);
         get(apiPrefix + "secure/deployments", DeploymentController::getAllDeployments, slimJson::write);
+        get(apiPrefix + "secure/deploymentSummaries", DeploymentController::getAllDeploymentSummaries, slimJson::write);
         post(apiPrefix + "secure/deployments", DeploymentController::createDeployment, fullJson::write);
         put(apiPrefix + "secure/deployments/:id", DeploymentController::updateDeployment, fullJson::write);
         post(apiPrefix + "secure/deployments/fromfeedsource/:id", DeploymentController::createDeploymentFromFeedSource, fullJson::write);
diff --git a/src/main/java/com/conveyal/datatools/manager/controllers/api/FeedSourceController.java b/src/main/java/com/conveyal/datatools/manager/controllers/api/FeedSourceController.java
index ce162c215..361c74f6d 100644
--- a/src/main/java/com/conveyal/datatools/manager/controllers/api/FeedSourceController.java
+++ b/src/main/java/com/conveyal/datatools/manager/controllers/api/FeedSourceController.java
@@ -1,6 +1,8 @@
 package com.conveyal.datatools.manager.controllers.api;
 
 import com.conveyal.datatools.common.utils.Scheduler;
+import com.conveyal.datatools.common.utils.aws.CheckedAWSException;
+import com.conveyal.datatools.common.utils.aws.S3Utils;
 import com.conveyal.datatools.manager.DataManager;
 import com.conveyal.datatools.manager.auth.Actions;
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
@@ -10,6 +12,7 @@
 import com.conveyal.datatools.manager.models.ExternalFeedSourceProperty;
 import com.conveyal.datatools.manager.models.FeedRetrievalMethod;
 import com.conveyal.datatools.manager.models.FeedSource;
+import com.conveyal.datatools.manager.models.FeedSourceSummary;
 import com.conveyal.datatools.manager.models.JsonViews;
 import com.conveyal.datatools.manager.models.Project;
 import com.conveyal.datatools.manager.models.transform.NormalizeFieldTransformation;
@@ -83,7 +86,7 @@ private static Collection<FeedSource> getProjectFeedSources(Request req, Respons
         boolean isAdmin = user.canAdministerProject(project);
 
         Collection<FeedSource> projectFeedSources = project.retrieveProjectFeedSources();
-        for (FeedSource source: projectFeedSources) {
+        for (FeedSource source : projectFeedSources) {
             String orgId = source.organizationId();
             // If user can view or manage feed, add to list of feeds to return. NOTE: By default most users with access
             // to a project should be able to view all feed sources. Custom privileges would need to be provided to
@@ -99,6 +102,31 @@ private static Collection<FeedSource> getProjectFeedSources(Request req, Respons
         return feedSourcesToReturn;
     }
 
+    private static Collection<FeedSourceSummary> getAllFeedSourceSummaries(Request req, Response res) {
+        Collection<FeedSourceSummary> feedSourcesToReturn = new ArrayList<>();
+        Auth0UserProfile user = req.attribute("user");
+        String projectId = req.queryParams("projectId");
+
+        Project project = Persistence.projects.getById(projectId);
+
+        if (project == null) {
+            logMessageAndHalt(req, 400, "Must provide valid projectId value.");
+        } else {
+            boolean isAdmin = user.canAdministerProject(project);
+            Collection<FeedSourceSummary> feedSourceSummaries = project.retrieveFeedSourceSummaries();
+            for (FeedSourceSummary feedSourceSummary : feedSourceSummaries) {
+                // If user can view or manage feed, add to list of feeds to return. NOTE: By default most users with access
+                // to a project should be able to view all feed sources. Custom privileges would need to be provided to
+                // override this behavior.
+                if (user.canManageOrViewFeed(project.organizationId, feedSourceSummary.projectId, feedSourceSummary.id)) {
+                    // Remove labels user can't view, then add to list of feeds to return.
+                    feedSourcesToReturn.add(cleanFeedSourceSummaryForNonAdmins(feedSourceSummary, isAdmin));
+                }
+            }
+        }
+        return feedSourcesToReturn;
+    }
+
     /**
      * HTTP endpoint to create a new feed source.
      */
@@ -189,7 +217,7 @@ private static void validate(Request req, FeedSource feedSource) {
      * fields the updated feed source should contain. This change allows us to parse the JSON into a POJO, which
      * essentially does type checking for us and prevents issues with deserialization from MongoDB into POJOs.
      */
-    private static FeedSource updateFeedSource(Request req, Response res) throws IOException {
+    private static FeedSource updateFeedSource(Request req, Response res) throws IOException, CheckedAWSException {
         String feedSourceId = req.params("id");
         FeedSource formerFeedSource = requestFeedSourceById(req, Actions.MANAGE);
         FeedSource updatedFeedSource = getPOJOFromRequestBody(req, FeedSource.class);
@@ -201,6 +229,12 @@ private static FeedSource updateFeedSource(Request req, Response res) throws IOE
         }
         Persistence.feedSources.replace(feedSourceId, updatedFeedSource);
 
+        // If feed just changed from public to private, delete feed from public repo if it's present there.
+        if (formerFeedSource.isPublic && !updatedFeedSource.isPublic) {
+            LOG.info("Deleting {} as feed is being adjusted from public to private.", updatedFeedSource.toPublicKey());
+            S3Utils.getDefaultS3Client().deleteObject(S3Utils.DEFAULT_BUCKET, updatedFeedSource.toPublicKey());
+        }
+
         if (shouldNotifyUsersOnFeedUpdated(formerFeedSource, updatedFeedSource)) {
             return updatedFeedSource;
         }
@@ -287,7 +321,7 @@ private static FeedSource deleteFeedSource(Request req, Response res) {
     /**
      * Re-fetch this feed from the feed source URL.
      */
-    private static String fetch (Request req, Response res) {
+    private static String fetch(Request req, Response res) {
         FeedSource s = requestFeedSourceById(req, Actions.MANAGE);
         if (s.url == null) {
             logMessageAndHalt(req, HttpStatus.BAD_REQUEST_400, "Cannot fetch feed source with null URL.");
@@ -305,7 +339,8 @@ private static String fetch (Request req, Response res) {
 
     /**
      * Helper function returns feed source if user has permission for specified action.
-     * @param req spark Request object from API request
+     *
+     * @param req    spark Request object from API request
      * @param action action type (either "view" or Permission.MANAGE)
      * @return feedsource object for ID
      */
@@ -356,39 +391,81 @@ public static FeedSource checkFeedSourcePermissions(Request req, FeedSource feed
         return cleanFeedSourceForNonAdmins(feedSource, isProjectAdmin);
     }
 
-    /** Determines whether a change to a feed source is significant enough that it warrants sending a notification
+    /**
+     * Determines whether a change to a feed source is significant enough that it warrants sending a notification
      *
      * @param formerFeedSource  A feed source object, without new changes
      * @param updatedFeedSource A feed source object, with new changes
-     * @return                  A boolean value indicating if the updated feed source is changed enough to warrant sending a notification.
+     * @return A boolean value indicating if the updated feed source is changed enough to warrant sending a notification.
      */
     private static boolean shouldNotifyUsersOnFeedUpdated(FeedSource formerFeedSource, FeedSource updatedFeedSource) {
-        return
-                // If only labels have changed, don't send out an email
-                formerFeedSource.equalsExceptLabels(updatedFeedSource);
+        // If only labels have changed, don't send out an email.
+        return formerFeedSource.equalsExceptLabels(updatedFeedSource);
     }
 
     /**
      * Removes labels and notes from a feed that a user is not allowed to view. Returns cleaned feed source.
-     * @param feedSource    The feed source to clean
-     * @param isAdmin       Is the user an admin? Changes what is returned.
-     * @return              A feed source containing only labels/notes the user is allowed to see
+     *
+     * @param feedSource The feed source to clean.
+     * @param isAdmin    Is the user an admin? Changes what is returned.
+     * @return A feed source containing only labels/notes the user is allowed to see.
      */
     protected static FeedSource cleanFeedSourceForNonAdmins(FeedSource feedSource, boolean isAdmin) {
         // Admin can view all feed labels, but a non-admin should only see those with adminOnly=false
-        feedSource.labelIds = Persistence.labels
-            .getFiltered(PersistenceUtils.applyAdminFilter(in("_id", feedSource.labelIds), isAdmin)).stream()
+        feedSource.labelIds = cleanFeedSourceLabelIdsForNonAdmins(feedSource.labelIds, isAdmin);
+        feedSource.noteIds = cleanFeedSourceNotesForNonAdmins(feedSource.noteIds, isAdmin);
+        return feedSource;
+    }
+
+    /**
+     * Removes labels and notes from a feed that a user is not allowed to view. Returns cleaned feed source summary.
+     *
+     * @param feedSourceSummary The feed source to clean.
+     * @param isAdmin           Is the user an admin? Changes what is returned.
+     * @return A feed source summary containing only labels/notes the user is allowed to see.
+     */
+    protected static FeedSourceSummary cleanFeedSourceSummaryForNonAdmins(FeedSourceSummary feedSourceSummary, boolean isAdmin) {
+        // Admin can view all feed labels, but a non-admin should only see those with adminOnly=false
+        feedSourceSummary.labelIds = cleanFeedSourceLabelIdsForNonAdmins(feedSourceSummary.labelIds, isAdmin);
+        feedSourceSummary.noteIds = cleanFeedSourceNotesForNonAdmins(feedSourceSummary.noteIds, isAdmin);
+        return feedSourceSummary;
+    }
+
+    /**
+     * Removes labels from a feed that a user is not allowed to view. Returns cleaned notes.
+     *
+     * @param labelIds The labels to clean.
+     * @param isAdmin  Is the user an admin? Changes what is returned.
+     * @return Labels the user is allowed to see.
+     */
+    protected static List<String> cleanFeedSourceLabelIdsForNonAdmins(List<String> labelIds, boolean isAdmin) {
+        // Admin can view all feed labels, but a non-admin should only see those with adminOnly=false.
+        return Persistence.labels
+            .getFiltered(PersistenceUtils.applyAdminFilter(in("_id", labelIds), isAdmin))
+            .stream()
             .map(label -> label.id)
             .collect(Collectors.toList());
-        feedSource.noteIds = Persistence.notes
-            .getFiltered(PersistenceUtils.applyAdminFilter(in("_id", feedSource.noteIds), isAdmin)).stream()
+    }
+
+    /**
+     * Removes notes from a feed that a user is not allowed to view. Returns cleaned notes.
+     *
+     * @param noteIds The notes to clean.
+     * @param isAdmin Is the user an admin? Changes what is returned.
+     * @return Notes the user is allowed to see.
+     */
+    protected static List<String> cleanFeedSourceNotesForNonAdmins(List<String> noteIds, boolean isAdmin) {
+        // Admin can view all feed notes, but a non-admin should only see those with adminOnly=false.
+        return Persistence.notes
+            .getFiltered(PersistenceUtils.applyAdminFilter(in("_id", noteIds), isAdmin))
+            .stream()
             .map(note -> note.id)
             .collect(Collectors.toList());
-        return feedSource;
     }
 
+
     // FIXME: use generic API controller and return JSON documents via BSON/Mongo
-    public static void register (String apiPrefix) {
+    public static void register(String apiPrefix) {
         get(apiPrefix + "secure/feedsource/:id", FeedSourceController::getFeedSource, json::write);
         get(apiPrefix + "secure/feedsource", FeedSourceController::getProjectFeedSources, json::write);
         post(apiPrefix + "secure/feedsource", FeedSourceController::createFeedSource, json::write);
@@ -396,5 +473,6 @@ public static void register (String apiPrefix) {
         put(apiPrefix + "secure/feedsource/:id/updateExternal", FeedSourceController::updateExternalFeedResource, json::write);
         delete(apiPrefix + "secure/feedsource/:id", FeedSourceController::deleteFeedSource, json::write);
         post(apiPrefix + "secure/feedsource/:id/fetch", FeedSourceController::fetch, json::write);
+        get(apiPrefix + "secure/feedsourceSummaries", FeedSourceController::getAllFeedSourceSummaries, json::write);
     }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/controllers/api/FeedVersionController.java b/src/main/java/com/conveyal/datatools/manager/controllers/api/FeedVersionController.java
index 035269e66..9dffd6adc 100644
--- a/src/main/java/com/conveyal/datatools/manager/controllers/api/FeedVersionController.java
+++ b/src/main/java/com/conveyal/datatools/manager/controllers/api/FeedVersionController.java
@@ -172,14 +172,16 @@ protected static FeedVersion cleanFeedVersionForNonAdmins(FeedVersion feedVersio
     private static boolean createFeedVersionFromSnapshot (Request req, Response res) {
 
         Auth0UserProfile userProfile = req.attribute("user");
+        Boolean publishProprietaryFiles = Boolean.parseBoolean(req.queryParams("publishProprietaryFiles"));
         // TODO: Should the ability to create a feedVersion from snapshot be controlled by the 'edit-gtfs' privilege?
         FeedSource feedSource = requestFeedSourceById(req, Actions.MANAGE);
         Snapshot snapshot = Persistence.snapshots.getById(req.queryParams("snapshotId"));
         if (snapshot == null) {
             logMessageAndHalt(req, 400, "Must provide valid snapshot ID");
         }
+        // Publishing the proprietary files will preserve the pattern names in the newly published feed version.
         CreateFeedVersionFromSnapshotJob createFromSnapshotJob =
-            new CreateFeedVersionFromSnapshotJob(feedSource, snapshot, userProfile);
+            new CreateFeedVersionFromSnapshotJob(feedSource, snapshot, userProfile, publishProprietaryFiles);
         JobUtils.heavyExecutor.execute(createFromSnapshotJob);
 
         return true;
diff --git a/src/main/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidation.java b/src/main/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidation.java
index c0b76d959..55504120c 100644
--- a/src/main/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidation.java
+++ b/src/main/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidation.java
@@ -21,8 +21,10 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -122,6 +124,13 @@ private static void validateTable(
         GTFSFeed gtfsFeed
     ) throws IOException {
         String tableId = specTable.get("id").asText();
+        boolean tableIsDirections = tableId.equals("directions");
+
+        Set<String> gtfsRoutes = new HashSet<>();
+        if (tableIsDirections) {
+            // Copy the gtfs routes into a set so that we can "check them off" (remove them).
+            gtfsRoutes.addAll(gtfsFeed.routes.keySet());
+        }
 
         // Read in table data from input stream.
         CsvReader csvReader = new CsvReader(inputStreamToValidate, ',', StandardCharsets.UTF_8);
@@ -167,15 +176,20 @@ private static void validateTable(
                 // Validate each value in row. Note: we iterate over the fields and not values because a row may be missing
                 // columns, but we still want to validate that missing value (e.g., if it is missing a required field).
                 for (int f = 0; f < fieldsFound.length; f++) {
+                    JsonNode specField = fieldsFound[f];
                     // If value exists for index, use that. Otherwise, default to null to avoid out of bounds exception.
                     String val = f < recordColumnCount ? rowValues[f] : null;
-                    validateTableValue(issues, tableId, rowIndex, rowValues, val, fieldsFound, fieldsFound[f], gtfsFeed);
+                    validateTableValue(issues, tableId, rowIndex, rowValues, val, fieldsFound, specField, gtfsFeed, gtfsRoutes, tableIsDirections);
                 }
             }
             rowIndex++;
         }
         csvReader.close();
 
+        if (tableIsDirections && !gtfsRoutes.isEmpty()) {
+            // After we're done validating all the table values, check if every route was checked off in directions.txt
+            issues.add(new ValidationIssue(tableId, null, -1, "Directions file doesn't define directions for all routes listed in routes.txt"));
+        }
         // Add issues for wrong number of columns and for empty rows after processing all rows.
         // Note: We considered adding an issue for each row, but opted for the single error approach because there's no
         // concept of a row-level issue in the UI right now. So we would potentially need to add that to the UI
@@ -205,7 +219,9 @@ private static void validateTableValue(
         String value,
         JsonNode[] specFieldsFound,
         JsonNode specField,
-        GTFSFeed gtfsFeed
+        GTFSFeed gtfsFeed,
+        Set<String> gtfsRoutes,
+        boolean tableIsDirections
     ) {
         if (specField == null) return;
         String fieldName = specField.get("name").asText();
@@ -300,6 +316,8 @@ private static void validateTableValue(
                 break;
         }
 
+        // "Check off" the route_id in directions.txt from the list to verify every route id has a direction
+        if (tableIsDirections && fieldName.equals("route_id")) gtfsRoutes.remove(value);
     }
 
     /** Construct missing ID text for validation issue description. */
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/CreateFeedVersionFromSnapshotJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/CreateFeedVersionFromSnapshotJob.java
index 6c711c74e..c6929a93b 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/CreateFeedVersionFromSnapshotJob.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/CreateFeedVersionFromSnapshotJob.java
@@ -22,11 +22,13 @@ public class CreateFeedVersionFromSnapshotJob extends FeedSourceJob {
 
     private final FeedVersion feedVersion;
     private final Snapshot snapshot;
+    private final boolean publishProprietaryFiles;
 
-    public CreateFeedVersionFromSnapshotJob(FeedSource feedSource, Snapshot snapshot, Auth0UserProfile owner) {
+    public CreateFeedVersionFromSnapshotJob(FeedSource feedSource, Snapshot snapshot, Auth0UserProfile owner, boolean publishProprietaryFiles) {
         super(owner, "Creating Feed Version from Snapshot for " + feedSource.name, JobType.CREATE_FEEDVERSION_FROM_SNAPSHOT);
         this.feedVersion = new FeedVersion(feedSource, snapshot);
         this.snapshot = snapshot;
+        this.publishProprietaryFiles = publishProprietaryFiles;
     }
 
     @Override
@@ -35,7 +37,7 @@ public void jobLogic() {
         // Add the jobs to handle this operation in order.
         addNextJob(
             // First export the snapshot to GTFS.
-            new ExportSnapshotToGTFSJob(owner, snapshot, feedVersion),
+            new ExportSnapshotToGTFSJob(owner, snapshot, feedVersion, publishProprietaryFiles),
             // Then, process feed version once GTFS file written.
             new ProcessSingleFeedJob(feedVersion, owner, true)
         );
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java
index 78ef55ea3..ffa8bd9a8 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java
@@ -7,6 +7,7 @@
 import com.amazonaws.services.ec2.model.Filter;
 import com.amazonaws.services.ec2.model.IamInstanceProfileSpecification;
 import com.amazonaws.services.ec2.model.Instance;
+import com.amazonaws.services.ec2.model.InstanceMetadataOptionsRequest;
 import com.amazonaws.services.ec2.model.InstanceNetworkInterfaceSpecification;
 import com.amazonaws.services.ec2.model.InstanceStateChange;
 import com.amazonaws.services.ec2.model.InstanceType;
@@ -651,6 +652,7 @@ public void jobFinished () {
         // Unconditionally add deploy summary. If the job fails, we should still record the summary.
         latestDeployment.deployJobSummaries.add(0, new DeploySummary(this));
         Persistence.deployments.replace(deployment.id, latestDeployment);
+
         // Send notification to those subscribed to updates for the deployment.
         NotifyUsersForSubscriptionJob.createNotification("deployment-updated", deployment.id, message);
         startAnotherAutoDeploymentIfNeeded();
@@ -992,6 +994,7 @@ private List<Instance> startEC2Instances(int count, boolean graphAlreadyBuilt) {
             return Collections.EMPTY_LIST;
         }
         status.message = String.format("Starting up %d new instance(s) to run OTP", count);
+
         RunInstancesRequest runInstancesRequest = new RunInstancesRequest()
                 .withNetworkInterfaces(interfaceSpecification)
                 .withInstanceType(instanceType)
@@ -1007,6 +1010,7 @@ private List<Instance> startEC2Instances(int count, boolean graphAlreadyBuilt) {
                 .withKeyName(otpServer.ec2Info.keyName)
                 // This will have the instance terminate when it is shut down.
                 .withInstanceInitiatedShutdownBehavior("terminate")
+                .withMetadataOptions(new InstanceMetadataOptionsRequest().withHttpTokens("optional").withHttpEndpoint("enabled"))
                 .withUserData(Base64.encodeBase64String(userData.getBytes()));
         List<Instance> instances;
         try {
@@ -1037,7 +1041,7 @@ private List<Instance> startEC2Instances(int count, boolean graphAlreadyBuilt) {
             String serverName = String.format("%s %s (%s) %d %s", deployment.tripPlannerVersion, deployment.name, dateString, serverCounter++, graphAlreadyBuilt ? "clone" : "builder");
             LOG.info("Creating tags for new EC2 instance {}", serverName);
             try {
-                getEC2ClientForDeployJob().createTags(new CreateTagsRequest()
+                CreateTagsRequest createTagsRequest = new CreateTagsRequest()
                         .withTags(new Tag("Name", serverName))
                         .withTags(new Tag("projectId", deployment.projectId))
                         .withTags(new Tag("deploymentId", deployment.id))
@@ -1045,8 +1049,17 @@ private List<Instance> startEC2Instances(int count, boolean graphAlreadyBuilt) {
                         .withTags(new Tag("serverId", otpServer.id))
                         .withTags(new Tag("routerId", getRouterId()))
                         .withTags(new Tag("user", retrieveEmail()))
-                        .withResources(instance.getInstanceId())
-                );
+                        .withResources(instance.getInstanceId());
+
+                String tagKey = DataManager.getConfigPropertyAsText("modules.deployment.ec2.tag_key");
+                String tagValue = DataManager.getConfigPropertyAsText("modules.deployment.ec2.tag_value");
+
+                Tag customTag = new Tag();
+                customTag.setKey(tagKey);
+                customTag.setValue(tagValue);
+
+                createTagsRequest = createTagsRequest.withTags(customTag);
+                getEC2ClientForDeployJob().createTags(createTagsRequest);
             } catch (Exception e) {
                 status.fail("Failed to create tags for instances.", e);
                 return instances;
@@ -1281,6 +1294,10 @@ public OtpRunnerManifest createAndUploadManifestAndConfigs(boolean graphAlreadyB
             }
         }
 
+        // upload shared stops file
+        String sharedStopsConfig = this.deployment.parentProject().sharedStopsConfig;
+        if (sharedStopsConfig != null) addStringContentsAsBaseFolderDownload(manifest, "shared_stops.csv", sharedStopsConfig);
+
         // upload otp-runner manifest to s3
         try {
             ObjectMapper mapper = new ObjectMapper();
@@ -1368,6 +1385,7 @@ public String constructUserData(boolean graphAlreadyBuilt) {
 
         List<String> lines = new ArrayList<>();
         lines.add("#!/bin/bash");
+        lines.add("mkdir /opt/otp/");
         // NOTE: user data output is logged to `/var/log/cloud-init-output.log` automatically with ec2 instances
         // Add some items to the $PATH as the $PATH with user-data scripts differs from the ssh $PATH.
         lines.add("export PATH=\"$PATH:/home/ubuntu/.yarn/bin\"");
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/GisExportJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/GisExportJob.java
index 2fb589368..849c173bb 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/GisExportJob.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/GisExportJob.java
@@ -12,10 +12,6 @@
 import com.conveyal.gtfs.model.Agency;
 import com.conveyal.gtfs.model.Route;
 import com.conveyal.gtfs.model.Stop;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Point;
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.io.FileUtils;
 import org.geotools.data.DataUtilities;
@@ -28,6 +24,10 @@
 import org.geotools.feature.DefaultFeatureCollection;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.slf4j.Logger;
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/PeliasUpdateJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/PeliasUpdateJob.java
index 964f75fed..375a051a3 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/PeliasUpdateJob.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/PeliasUpdateJob.java
@@ -142,6 +142,7 @@ private String makeWebhookRequest() {
         PeliasWebhookRequestBody peliasWebhookRequestBody = new PeliasWebhookRequestBody();
         peliasWebhookRequestBody.gtfsFeeds = gtfsFeeds;
         peliasWebhookRequestBody.csvFiles = deployment.peliasCsvFiles;
+        peliasWebhookRequestBody.peliasSynonymsBase64 = deployment.peliasSynonymsBase64;
         peliasWebhookRequestBody.logUploadUrl = logUploadS3URI.toString();
         peliasWebhookRequestBody.deploymentId = deployment.id;
         peliasWebhookRequestBody.resetDb = deployment.peliasResetDb;
@@ -218,6 +219,8 @@ private static class PeliasWebhookRequestBody {
         public String logUploadUrl;
         public String deploymentId;
         public boolean resetDb;
+
+        public String peliasSynonymsBase64;
     }
 
     /**
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/ProcessSingleFeedJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/ProcessSingleFeedJob.java
index 978e50162..c267fdd9a 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/ProcessSingleFeedJob.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/ProcessSingleFeedJob.java
@@ -108,6 +108,7 @@ public void jobLogic() {
 
         // Next, validate the feed.
         addNextJob(new ValidateFeedJob(feedVersion, owner, isNewVersion));
+        addNextJob(new ValidateMobilityDataFeedJob(feedVersion, owner, isNewVersion));
 
         // We only need to snapshot the feed if there are transformations at the database level. In the case that there
         // are, the snapshot namespace will be the target of these modifications. If we were to apply the modifications
@@ -129,7 +130,8 @@ public void jobLogic() {
             snapshot.feedTransformResult = dbTarget.feedTransformResult;
             // If the user has selected to create a new version from the resulting snapshot, do so here.
             if (rules.createNewVersion) {
-                addNextJob(new CreateFeedVersionFromSnapshotJob(feedSource, snapshot, owner));
+                // Publishing the proprietary files will preserve the pattern names in the newly created feed version.
+                addNextJob(new CreateFeedVersionFromSnapshotJob(feedSource, snapshot, owner, true));
             }
         }
 
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/PublishProjectFeedsJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/PublishProjectFeedsJob.java
index 01ef645a5..214790baa 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/PublishProjectFeedsJob.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/PublishProjectFeedsJob.java
@@ -16,6 +16,9 @@
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 
+import static com.conveyal.datatools.manager.DataManager.getConfigPropertyAsText;
+import static com.conveyal.datatools.manager.DataManager.hasConfigProperty;
+
 /**
  * Publish the latest GTFS files for all public feeds in a project.
  */
@@ -23,6 +26,7 @@ public class PublishProjectFeedsJob extends MonitorableJob {
     public static final Logger LOG = LoggerFactory.getLogger(PublishProjectFeedsJob.class);
 
     private Project project;
+    private static final String dataSupportEmail = getConfigPropertyAsText("application.public_gtfs_contact_email");
 
     public PublishProjectFeedsJob(Project project, Auth0UserProfile owner) {
         super(owner, "Generating public html for " + project.name, JobType.MAKE_PROJECT_PUBLIC);
@@ -54,6 +58,9 @@ public void jobLogic () {
         r.append("<body>\n");
         r.append("<h1>" + title + "</h1>\n");
         r.append("The following feeds, in GTFS format, are available for download and use.\n");
+        if (dataSupportEmail != null) {
+            r.append(String.format("If you have inquiries, please contact us at: <a href=\"mailto:%1$s\">%1$s</a>", dataSupportEmail));
+        }
         r.append("<ul>\n");
         status.update("Ensuring public GTFS files are up-to-date.", 50);
         project.retrieveProjectFeedSources().stream()
@@ -61,7 +68,7 @@ public void jobLogic () {
                 .forEach(fs -> {
                     // generate list item for feed source
                     String url;
-                    if (fs.url != null) {
+                    if (fs.url != null && !hasConfigProperty("modules.enterprise.prefer_s3_links")) {
                         url = fs.url.toString();
                     }
                     else {
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/ValidateFeedJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/ValidateFeedJob.java
index 7c8a06541..6f4c6feb6 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/ValidateFeedJob.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/ValidateFeedJob.java
@@ -44,13 +44,7 @@ public void jobFinished () {
                 // such as BuildTransportNetwork, to finish. If those subsequent jobs fail,
                 // the version won't get loaded into MongoDB (even though it exists in postgres).
                 feedVersion.storeUser(owner);
-                if (isNewVersion) {
-                    int count = feedVersion.parentFeedSource().feedVersionCount();
-                    feedVersion.version = count + 1;
-                    Persistence.feedVersions.create(feedVersion);
-                } else {
-                    Persistence.feedVersions.replace(feedVersion.id, feedVersion);
-                }
+                feedVersion.persistFeedVersionAfterValidation(isNewVersion);
                 // Schedule expiration notification jobs.
                 Scheduler.scheduleExpirationNotifications(feedVersion.parentFeedSource());
             }
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/ValidateMobilityDataFeedJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/ValidateMobilityDataFeedJob.java
new file mode 100644
index 000000000..c811c10d0
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/ValidateMobilityDataFeedJob.java
@@ -0,0 +1,70 @@
+package com.conveyal.datatools.manager.jobs;
+
+import com.conveyal.datatools.common.status.FeedVersionJob;
+import com.conveyal.datatools.manager.auth.Auth0UserProfile;
+import com.conveyal.datatools.manager.models.FeedVersion;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This job handles the MobilityData validation of a given feed version. If the version is not new, it will simply
+ * replace the existing version with the version object that has updated validation info.
+ */
+public class ValidateMobilityDataFeedJob extends FeedVersionJob {
+    public static final Logger LOG = LoggerFactory.getLogger(ValidateMobilityDataFeedJob.class);
+
+    private final FeedVersion feedVersion;
+    private final boolean isNewVersion;
+
+    public ValidateMobilityDataFeedJob(FeedVersion version, Auth0UserProfile owner, boolean isNewVersion) {
+        super(owner, "Validating Feed using MobilityData", JobType.VALIDATE_FEED);
+        feedVersion = version;
+        this.isNewVersion = isNewVersion;
+        status.update("Waiting to begin MobilityData validation...", 0);
+    }
+
+    @Override
+    public void jobLogic () {
+        LOG.info("Running ValidateMobilityDataFeedJob for {}", feedVersion.id);
+        feedVersion.validateMobility(status);
+    }
+
+    @Override
+    public void jobFinished () {
+        if (!status.error) {
+            if (parentJobId != null && JobType.PROCESS_FEED.equals(parentJobType)) {
+                // Validate stage is happening as part of an overall process feed job.
+                // At this point all GTFS data has been loaded and validated, so we record
+                // the FeedVersion into mongo.
+                // This happens here because otherwise we would have to wait for other jobs,
+                // such as BuildTransportNetwork, to finish. If those subsequent jobs fail,
+                // the version won't get loaded into MongoDB (even though it exists in postgres).
+                feedVersion.persistFeedVersionAfterValidation(isNewVersion);
+            }
+            status.completeSuccessfully("MobilityData validation finished!");
+        } else {
+            // If the version was not stored successfully, call FeedVersion#delete to reset things to before the version
+            // was uploaded/fetched. Note: delete calls made to MongoDB on the version ID will not succeed, but that is
+            // expected.
+            feedVersion.delete();
+        }
+    }
+
+    /**
+     * Getter that allows a client to know the ID of the feed version that will be created as soon as the upload is
+     * initiated; however, we will not store the FeedVersion in the mongo application database until the upload and
+     * processing is completed. This prevents clients from manipulating GTFS data before it is entirely imported.
+     */
+    @JsonProperty
+    public String getFeedVersionId () {
+        return feedVersion.id;
+    }
+
+    @JsonProperty
+    public String getFeedSourceId () {
+        return feedVersion.parentFeedSource().id;
+    }
+
+
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/CalendarDatesMergeLineContext.java b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/CalendarDatesMergeLineContext.java
index 649e0c088..d65548e23 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/CalendarDatesMergeLineContext.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/CalendarDatesMergeLineContext.java
@@ -87,6 +87,7 @@ private boolean checkCalendarDatesIds(FieldContext fieldContext) throws IOExcept
         // the valid date range, i.e., before the future feed's first date.
         if (!shouldSkipRecord && fieldContext.nameEquals(SERVICE_ID)) {
             mergeFeedsResult.serviceIds.add(fieldContext.getValueToWrite());
+            mergeFeedsResult.calendarDatesServiceIds.add(fieldContext.getValueToWrite());
         }
 
         return !shouldSkipRecord;
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/CalendarMergeLineContext.java b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/CalendarMergeLineContext.java
index ab8902531..1f6cd27aa 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/CalendarMergeLineContext.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/CalendarMergeLineContext.java
@@ -111,6 +111,7 @@ private boolean checkCalendarIds(Set<NewGTFSError> idErrors, FieldContext fieldC
         // If service is going to be cloned, add to the output service ids.
         if (!shouldSkipRecord && fieldContext.nameEquals(SERVICE_ID)) {
             mergeFeedsResult.serviceIds.add(fieldContext.getValueToWrite());
+            mergeFeedsResult.calendarServiceIds.add(fieldContext.getValueToWrite());
         }
 
         return !shouldSkipRecord;
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeFeedsResult.java b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeFeedsResult.java
index 1adadbb91..881c78051 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeFeedsResult.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeFeedsResult.java
@@ -21,10 +21,21 @@ public class MergeFeedsResult implements Serializable {
     /** Contains the set of IDs for records that were excluded in the merged feed */
     public Set<String> skippedIds = new HashSet<>();
     /**
-     * Track the set of service IDs to end up in the merged feed in order to determine which calendar_dates and trips
-     * records should be retained in the merged result.
+     * Track the set of service IDs to end up in the merged feed in order to determine which calendar, calendar_dates and
+     * trip records should be retained in the merged result.
      */
     public Set<String> serviceIds  = new HashSet<>();
+
+    /**
+     * Track the set of service IDs obtained from calendar records.
+     */
+    public Set<String> calendarServiceIds = new HashSet<>();
+
+    /**
+     * Track the set of service IDs obtained from calendar date records.
+     */
+    public Set<String> calendarDatesServiceIds = new HashSet<>();
+
     /**
      * Track the set of route IDs to end up in the merged feed in order to determine which route_attributes
      * records should be retained in the merged result.
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java
index bbcdcbb9c..320ba54dd 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java
@@ -237,10 +237,36 @@ public void startNewRow() throws IOException {
             .collect(Collectors.toList());
     }
 
+    /**
+     * Determine which reference table to use. If there is only one reference use this. If there are multiple references
+     * determine the context and then the correct reference table to use.
+     */
+    private Table getReferenceTable(FieldContext fieldContext, Field field) {
+        if (field.referenceTables.size() == 1) {
+            return field.referenceTables.iterator().next();
+        }
+
+        switch (ReferenceTableDiscovery.getReferenceTableKey(field, table)) {
+            case TRIP_SERVICE_ID_KEY:
+                return ReferenceTableDiscovery.getTripServiceIdReferenceTable(
+                    fieldContext.getValueToWrite(),
+                    mergeFeedsResult,
+                    getTableScopedValue(Table.CALENDAR, fieldContext.getValue()),
+                    getTableScopedValue(Table.CALENDAR_DATES, fieldContext.getValue())
+                );
+            // Include other cases as multiple references are added e.g. flex!.
+            default:
+                return null;
+        }
+    }
+
     public boolean checkForeignReferences(FieldContext fieldContext) throws IOException {
         Field field = fieldContext.getField();
         if (field.isForeignReference()) {
-            String key = getTableScopedValue(field.referenceTable, fieldContext.getValue());
+            Table refTable = getReferenceTable(fieldContext, field);
+            String key = (refTable != null)
+                ? getTableScopedValue(refTable, fieldContext.getValue())
+                : "unknown";
             // Check if we're performing a service period merge, this ref field is a service_id, and it
             // is not found in the list of service_ids (e.g., it was removed).
             boolean isValidServiceId = mergeFeedsResult.serviceIds.contains(fieldContext.getValueToWrite());
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/ReferenceTableDiscovery.java b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/ReferenceTableDiscovery.java
new file mode 100644
index 000000000..a972dbc25
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/ReferenceTableDiscovery.java
@@ -0,0 +1,90 @@
+package com.conveyal.datatools.manager.jobs.feedmerge;
+
+import com.conveyal.gtfs.loader.Field;
+import com.conveyal.gtfs.loader.Table;
+
+import java.util.stream.Collectors;
+
+import static com.conveyal.datatools.manager.jobs.feedmerge.MergeLineContext.SERVICE_ID;
+
+public class ReferenceTableDiscovery {
+
+    public static final String REF_TABLE_SEPARATOR = "#~#";
+
+    public enum ReferenceTableKey {
+
+        TRIP_SERVICE_ID_KEY(
+            String.join(
+                REF_TABLE_SEPARATOR,
+                Table.TRIPS.name,
+                SERVICE_ID,
+                Table.CALENDAR.name,
+                Table.CALENDAR_DATES.name,
+                Table.SCHEDULE_EXCEPTIONS.name
+            )
+        );
+
+        private final String value;
+
+        ReferenceTableKey(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public static ReferenceTableKey fromValue(String key) {
+            for (ReferenceTableKey ref: ReferenceTableKey.values()) {
+                if (ref.getValue().equals(key)) {
+                    return ref;
+                }
+            }
+            throw new UnsupportedOperationException(String.format("Unsupported reference table key: %s.", key));
+        }
+    }
+
+    /**
+     * Get reference table key by matching the provided values to predefined reference table keys.
+     */
+    public static ReferenceTableKey getReferenceTableKey(Field field, Table table) {
+        return ReferenceTableKey.fromValue(createKey(field, table));
+    }
+
+    /**
+     * Create a unique key for this table, field and reference tables.
+     */
+    public static String createKey(Field field, Table table) {
+        return String.format(
+            "%s%s%s%s%s",
+            table.name,
+            REF_TABLE_SEPARATOR,
+            field.name,
+            REF_TABLE_SEPARATOR,
+            field.referenceTables.stream().map(r -> r.name).collect(Collectors.joining(REF_TABLE_SEPARATOR))
+        );
+    }
+
+    /**
+     * Define the reference table for a trip service id.
+     */
+    public static Table getTripServiceIdReferenceTable(
+        String fieldValue,
+        MergeFeedsResult mergeFeedsResult,
+        String calendarKey,
+        String calendarDatesKey
+    ) {
+        if (
+            mergeFeedsResult.calendarServiceIds.contains(fieldValue) ||
+            mergeFeedsResult.skippedIds.contains(calendarKey)
+        ) {
+            return Table.CALENDAR;
+        } else if (
+            mergeFeedsResult.calendarDatesServiceIds.contains(fieldValue) ||
+            mergeFeedsResult.skippedIds.contains(calendarDatesKey)
+        ) {
+            return Table.CALENDAR_DATES;
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsHeader.java b/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsHeader.java
new file mode 100644
index 000000000..9d63ae7ce
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsHeader.java
@@ -0,0 +1,37 @@
+package com.conveyal.datatools.manager.jobs.validation;
+
+import java.util.Map;
+
+public enum SharedStopsHeader {
+
+    STOP_GROUP_ID_INDEX("stop_group_id"),
+
+    STOP_ID_INDEX("stop_id"),
+
+    IS_PRIMARY_INDEX("is_primary"),
+
+    FEED_ID_INDEX("feed_id");
+
+    public final String headerName;
+
+    SharedStopsHeader(String name) {
+        this.headerName = name;
+    }
+
+    public String getHeaderName() {
+        return headerName;
+    }
+
+    public static SharedStopsHeader fromValue(String headerName) {
+        for (SharedStopsHeader sharedStopsHeader : SharedStopsHeader.values()) {
+            if (sharedStopsHeader.getHeaderName().equalsIgnoreCase(headerName)) {
+                return sharedStopsHeader;
+            }
+        }
+        throw new UnsupportedOperationException(String.format("Unknown shared stops header: %s", headerName));
+    }
+
+    public static boolean hasRequiredHeaders(Map<SharedStopsHeader, Integer> headerIndices) {
+        return headerIndices.size() == SharedStopsHeader.values().length;
+    }
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidator.java b/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidator.java
new file mode 100644
index 000000000..ed8d1a58e
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidator.java
@@ -0,0 +1,169 @@
+package com.conveyal.datatools.manager.jobs.validation;
+
+import com.conveyal.datatools.manager.models.Project;
+import com.conveyal.gtfs.error.NewGTFSError;
+import com.conveyal.gtfs.error.NewGTFSErrorType;
+import com.conveyal.gtfs.error.SQLErrorStorage;
+import com.conveyal.gtfs.loader.Feed;
+import com.conveyal.gtfs.model.Stop;
+import com.conveyal.gtfs.validator.FeedValidator;
+import com.csvreader.CsvReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import static com.conveyal.datatools.manager.jobs.validation.SharedStopsHeader.STOP_GROUP_ID_INDEX;
+import static com.conveyal.datatools.manager.jobs.validation.SharedStopsHeader.STOP_ID_INDEX;
+
+public class SharedStopsValidator extends FeedValidator {
+    private static final Logger LOG = LoggerFactory.getLogger(SharedStopsValidator.class);
+
+    Feed feed;
+    String feedId;
+    Project project;
+
+    public SharedStopsValidator(Project project, String feedId) {
+        super(null, null);
+        this.project = project;
+        this.feedId = feedId;
+    }
+
+    // This method can only be run on a SharedStopsValidator that has been set up with a project only
+    public SharedStopsValidator buildSharedStopsValidator(Feed feed, SQLErrorStorage errorStorage) {
+        if (this.project == null) {
+            throw new RuntimeException("Shared stops validator can not be called because no project has been set!");
+        }
+        if (this.feedId == null) {
+            throw new RuntimeException("Shared stops validator can not be called because no feed ID has been set!");
+        }
+        return new SharedStopsValidator(feed, errorStorage, this.project, this.feedId);
+    }
+
+    public SharedStopsValidator(Feed feed, SQLErrorStorage errorStorage, Project project, String feedId) {
+        super(feed, errorStorage);
+        this.feed = feed;
+        this.project = project;
+        this.feedId = feedId;
+    }
+
+    public static String[] getHeaders(CsvReader configReader) throws IOException {
+        configReader.setHeaders(configReader.getRawRecord().split(","));
+        return configReader.getHeaders();
+    }
+
+    public static Map<SharedStopsHeader, Integer> getHeaderIndices(CsvReader configReader) {
+        Map<SharedStopsHeader, Integer> headerIndices = new EnumMap<>(SharedStopsHeader.class);
+
+        try {
+            configReader.readRecord();
+            String[] headers = getHeaders(configReader);
+
+            for (int i = 0; i < headers.length; i++) {
+                String header = headers[i];
+                switch (SharedStopsHeader.fromValue(header)) {
+                    case STOP_GROUP_ID_INDEX:
+                        headerIndices.put(STOP_GROUP_ID_INDEX, i);
+                        break;
+                    case FEED_ID_INDEX:
+                        headerIndices.put(SharedStopsHeader.FEED_ID_INDEX, i);
+                        break;
+                    case STOP_ID_INDEX:
+                        headerIndices.put(STOP_ID_INDEX, i);
+                        break;
+                    case IS_PRIMARY_INDEX:
+                        headerIndices.put(SharedStopsHeader.IS_PRIMARY_INDEX, i);
+                        break;
+                }
+            }
+
+            if (!SharedStopsHeader.hasRequiredHeaders(headerIndices)) {
+                throw new RuntimeException("shared_stops.csv is missing headers!");
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("shared_stops.csv was invalid!", e);
+        }
+        return headerIndices;
+    }
+
+    @Override
+    public void validate() {
+        String config = project.sharedStopsConfig;
+        if (config == null) {
+            return;
+        }
+
+        CsvReader configReader = CsvReader.parse(config);
+
+        // Build list of stop Ids.
+        List<String> stopIds = new ArrayList<>();
+        List<Stop> stops = new ArrayList<>();
+
+        for (Stop stop : feed.stops) {
+            stops.add(stop);
+            stopIds.add(stop.stop_id);
+        }
+
+        // Initialize hashmaps to hold duplication info.
+        HashSet<String> seenStopIds = new HashSet<>();
+        HashSet<String> stopGroupsWithPrimaryStops = new HashSet<>();
+
+        try {
+            Map<SharedStopsHeader, Integer> headerIndices = getHeaderIndices(configReader);
+            while (configReader.readRecord()) {
+                String stopGroupId = configReader.get(headerIndices.get(STOP_GROUP_ID_INDEX));
+                String stopId = configReader.get(headerIndices.get(STOP_ID_INDEX));
+                String sharedStopFeedId = configReader.get(headerIndices.get(SharedStopsHeader.FEED_ID_INDEX));
+
+                if (stopId.equals(STOP_ID_INDEX.headerName)) {
+                    // Swallow header row.
+                    continue;
+                }
+
+                // Check for SS_01 (stop id appearing in multiple stop groups).
+                // Make sure this error is only returned if we are inside the feed that is being checked.
+                Stop syntheticStop = new Stop();
+                syntheticStop.stop_id = stopId;
+                if (feedId.equals(sharedStopFeedId)) {
+                    if (seenStopIds.contains(stopId)) {
+                        registerError(stops
+                            .stream()
+                            .filter(stop -> stop.stop_id.equals(stopId))
+                            .findFirst()
+                            .orElse(syntheticStop), NewGTFSErrorType.MULTIPLE_SHARED_STOPS_GROUPS
+                        );
+                    } else {
+                        seenStopIds.add(stopId);
+                    }
+                }
+
+                // Check for SS_02 (multiple primary stops per stop group).
+                if (
+                    configReader.get(headerIndices.get(SharedStopsHeader.IS_PRIMARY_INDEX)).equals("1") ||
+                    configReader.get(headerIndices.get(SharedStopsHeader.IS_PRIMARY_INDEX)).equals("true")
+                ) {
+                    if (stopGroupsWithPrimaryStops.contains(stopGroupId)) {
+                        registerError(NewGTFSError.forFeed(NewGTFSErrorType.SHARED_STOP_GROUP_MULTIPLE_PRIMARY_STOPS, stopGroupId));
+                    } else {
+                        stopGroupsWithPrimaryStops.add(stopGroupId);
+                    }
+                }
+
+                // Check for SS_03 (stop_id referenced doesn't exist).
+                // Make sure this error is only returned if we are inside the feed that is being checked.
+                if (feedId.equals(sharedStopFeedId) && !stopIds.contains(stopId)) {
+                    registerError(NewGTFSError.forFeed(NewGTFSErrorType.SHARED_STOP_GROUP_ENTITY_DOES_NOT_EXIST, stopId));
+                }
+            }
+        } catch (IOException e) {
+            LOG.error("Unable to validate shared stops.", e);
+        } finally {
+            configReader.close();
+        }
+    }
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/models/Deployment.java b/src/main/java/com/conveyal/datatools/manager/models/Deployment.java
index db2ce0a7c..7186eef39 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/Deployment.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/Deployment.java
@@ -41,11 +41,15 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import static com.conveyal.datatools.manager.DataManager.getConfigPropertyAsText;
+import static com.conveyal.datatools.manager.utils.HttpUtils.downloadFileFromURL;
 import static com.mongodb.client.model.Filters.and;
 import static com.mongodb.client.model.Filters.eq;
 
@@ -62,7 +66,8 @@ public class Deployment extends Model implements Serializable {
 
     public String name;
 
-    public static final String DEFAULT_OTP_VERSION = "otp-v1.4.0";
+    //OTP v1.4 is a historical version that was previously used as a fallback. Only use if application default not configured.
+    public static final String DEFAULT_OTP_VERSION = getConfigPropertyAsText("application.default_otp_version", "otp-v1.4.0");
 
     /** What server is this currently deployed to? */
     public String deployedTo;
@@ -77,6 +82,8 @@ public class Deployment extends Model implements Serializable {
     public boolean peliasResetDb;
     public List<String> peliasCsvFiles = new ArrayList<>();
 
+    public String peliasSynonymsBase64;
+
     /**
      * Get parent project for deployment. Note: at one point this was a JSON property of this class, but severe
      * performance issues prevent this field from scaling to be fetched/assigned to a large collection of deployments.
@@ -181,7 +188,7 @@ public List<EC2InstanceSummary> retrieveEC2Instances() throws CheckedAWSExceptio
      * {@link Deployment#DEFAULT_OTP_VERSION}. This is used to determine what jar file to download and does not have an
      * exact match to actual numbered/tagged releases.
      */
-    public String otpVersion;
+    public String otpVersion = DEFAULT_OTP_VERSION;
 
     public boolean buildGraphOnly;
 
@@ -203,7 +210,9 @@ public DeployJob.DeploySummary latest () {
     public String routerId;
 
     public String customBuildConfig;
+    public String customBuildConfigUrl;
     public String customRouterConfig;
+    public String customRouterConfigUrl;
 
     public List<CustomFile> customFiles = new ArrayList<>();
 
@@ -394,32 +403,55 @@ public void dump (File output, boolean includeManifest, boolean includeOsm, bool
                 out.closeEntry();
             }
         }
+
+        // Include shared_stops.csv, if present
+        if (parentProject().sharedStopsConfig != null) {
+            byte[] sharedStopsConfigAsBytes = parentProject().sharedStopsConfig.getBytes(StandardCharsets.UTF_8);
+            ZipEntry sharedStopsEntry = new ZipEntry("shared_stops.csv");
+            out.putNextEntry(sharedStopsEntry);
+            out.write(sharedStopsConfigAsBytes);
+            out.closeEntry();
+        }
+
         // Finally close the zip output stream. The dump file is now complete.
         out.close();
     }
 
-    /** Generate build config for deployment as byte array (for writing to file output stream). */
-    public byte[] generateBuildConfig() {
-        Project project = this.parentProject();
+    /** Download config from provided URL. */
+    public String downloadConfig(String configUrl) throws IOException {
+        if (configUrl != null) {
+            try {
+                // TODO: validate JSON?
+                return new String(downloadFileFromURL(new URL(configUrl)), StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                String message = String.format("Could not download config file from %s.", configUrl);
+                LOG.error(message);
+                throw new IOException(message, e);
+            }
+        }
+        return null;
+    }
+
+    /** Generate build config for deployment as byte array (for writing to file output stream). If an external build
+     * config is available and is successfully downloaded, use this instead of the deployment build config. If there is
+     * no deployment build config, use the project build config. */
+    public byte[] generateBuildConfig() throws IOException {
+        String downloadedConfig = downloadConfig(customBuildConfigUrl);
+        if (downloadedConfig != null) {
+            customBuildConfig = downloadedConfig;
+        }
         return customBuildConfig != null
             ? customBuildConfig.getBytes(StandardCharsets.UTF_8)
-            : project.buildConfig != null
-                ? writeToBytes(project.buildConfig)
-                : null;
+            : null;
     }
 
     public String generateBuildConfigAsString() {
-        if (customBuildConfig != null) return customBuildConfig;
-        return writeToString(this.parentProject().buildConfig);
-    }
-
-    /** Convenience method to write serializable object (primarily for router/build config objects) to byte array. */
-    private <O extends Serializable> byte[] writeToBytes(O object) {
         try {
-            return otpConfigMapper.writer().writeValueAsBytes(object);
-        } catch (JsonProcessingException e) {
-            LOG.error("Value contains malformed JSON", e);
-            return null;
+            return new String(generateBuildConfig(), StandardCharsets.UTF_8);
+            // TODO: Correctly generate default build config
+        } catch (Exception e) {
+            LOG.error("Failed to generate build config: ", e);
+            return "";
         }
     }
 
@@ -434,19 +466,26 @@ private <O extends Serializable> String writeToString(O object) {
     }
 
     /** Generate router config for deployment as string. */
-    public byte[] generateRouterConfig() {
-        Project project = this.parentProject();
+    public byte[] generateRouterConfig() throws IOException {
+        String downloadedConfig = downloadConfig(customRouterConfigUrl);
+        if (downloadedConfig != null) {
+            customRouterConfig = downloadedConfig;
+        }
+
         return customRouterConfig != null
             ? customRouterConfig.getBytes(StandardCharsets.UTF_8)
-            : project.routerConfig != null
-                ? writeToBytes(project.routerConfig)
-                : null;
+            : null;
     }
 
     /** Generate router config for deployment as byte array (for writing to file output stream). */
     public String generateRouterConfigAsString() {
-        if (customRouterConfig != null) return customRouterConfig;
-        return writeToString(this.parentProject().routerConfig);
+            try {
+                return new String(generateRouterConfig(), StandardCharsets.UTF_8);
+                // TODO: Correctly generate default router config
+            } catch (Exception e) {
+                LOG.error("Failed to generate router config: ", e);
+                return "";
+        }
     }
 
     /**
diff --git a/src/main/java/com/conveyal/datatools/manager/models/DeploymentSummary.java b/src/main/java/com/conveyal/datatools/manager/models/DeploymentSummary.java
new file mode 100644
index 000000000..d3959ac27
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/models/DeploymentSummary.java
@@ -0,0 +1,85 @@
+package com.conveyal.datatools.manager.models;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * A summary of deployment items used to list available deployments without the need to return all deployment information.
+ */
+@JsonInclude()
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DeploymentSummary {
+
+    /**
+     * Deployment Id.
+     */
+    public String id;
+
+    /**
+     * Name given to this deployment.
+     */
+    public String name;
+
+    /**
+     * Date when the deployment was created.
+     */
+    public Date dateCreated;
+
+    /**
+     * Date when the deployment was last deployed to a server.
+     */
+    public Date lastDeployed;
+
+    /**
+     * What server is this currently deployed to, if any?
+     */
+    public String deployedTo;
+
+    /**
+     * Number of feed versions associated with this project.
+     */
+    public int numberOfFeedVersions;
+
+    /**
+     * If not using the 'default' router, this value will be set to true.
+     */
+    public boolean test;
+
+    /**
+     * Deployment is pinned.
+     */
+    public boolean isPinned;
+
+    /**
+     * The name of the server this is currently deployed to, if any.
+     */
+    public String serverName;
+
+    /**
+     * Create an empty deployment summary, for use with dump/restore and testing.
+     */
+    public DeploymentSummary() {
+    }
+
+    /**
+     * Extract from a deployment and parent project, deployment summary values.
+     */
+    public DeploymentSummary(Deployment deployment, Project project, List<OtpServer> otpServers) {
+        this.id = deployment.id;
+        this.name = deployment.name;
+        this.dateCreated = deployment.dateCreated;
+        this.lastDeployed = deployment.retrieveLastDeployed();
+        this.deployedTo = deployment.deployedTo;
+        this.numberOfFeedVersions = deployment.feedVersionIds.size();
+        this.test = deployment.routerId != null;
+        this.isPinned = project.pinnedDeploymentId != null && project.pinnedDeploymentId.equals(deployment.id);
+        OtpServer server = otpServers
+            .stream()
+            .filter(s -> s.id.equals(deployedTo))
+            .findFirst()
+            .orElse(null);
+        this.serverName = (server != null) ? server.name : null;
+    }
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/models/FeedSource.java b/src/main/java/com/conveyal/datatools/manager/models/FeedSource.java
index 3dcd7f4e8..db7eea7a9 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/FeedSource.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/FeedSource.java
@@ -420,13 +420,10 @@ public String toString () {
      */
     @JsonIgnore
     public FeedVersion retrieveLatest() {
-        FeedVersion newestVersion = Persistence.feedVersions
-                .getOneFiltered(eq("feedSourceId", this.id), Sorts.descending("version"));
-        if (newestVersion == null) {
-            // Is this what happens if there are none?
-            return null;
-        }
-        return newestVersion;
+        return Persistence.feedVersions.getOneFiltered(
+            eq("feedSourceId", this.id),
+            Sorts.descending("version")
+        );
     }
 
     /**
diff --git a/src/main/java/com/conveyal/datatools/manager/models/FeedSourceSummary.java b/src/main/java/com/conveyal/datatools/manager/models/FeedSourceSummary.java
new file mode 100644
index 000000000..15f93e57b
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/models/FeedSourceSummary.java
@@ -0,0 +1,570 @@
+package com.conveyal.datatools.manager.models;
+
+import com.conveyal.datatools.editor.utils.JacksonSerializers;
+import com.conveyal.datatools.manager.persistence.Persistence;
+import com.conveyal.gtfs.validator.ValidationResult;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.google.common.collect.Lists;
+import com.mongodb.client.model.Accumulators;
+import com.mongodb.client.model.Projections;
+import com.mongodb.client.model.Sorts;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.mongodb.client.model.Aggregates.group;
+import static com.mongodb.client.model.Aggregates.limit;
+import static com.mongodb.client.model.Aggregates.lookup;
+import static com.mongodb.client.model.Aggregates.match;
+import static com.mongodb.client.model.Aggregates.project;
+import static com.mongodb.client.model.Aggregates.replaceRoot;
+import static com.mongodb.client.model.Aggregates.sort;
+import static com.mongodb.client.model.Aggregates.unwind;
+import static com.mongodb.client.model.Filters.in;
+
+public class FeedSourceSummary {
+    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+    public String projectId;
+
+    public String id;
+
+    public String name;
+    public boolean deployable;
+    public boolean isPublic;
+
+    @JsonSerialize(using = JacksonSerializers.LocalDateIsoSerializer.class)
+    @JsonDeserialize(using = JacksonSerializers.LocalDateIsoDeserializer.class)
+    public LocalDate lastUpdated;
+
+    public List<String> labelIds = new ArrayList<>();
+
+    public String deployedFeedVersionId;
+
+    @JsonSerialize(using = JacksonSerializers.LocalDateIsoSerializer.class)
+    @JsonDeserialize(using = JacksonSerializers.LocalDateIsoDeserializer.class)
+    public LocalDate deployedFeedVersionStartDate;
+
+    @JsonSerialize(using = JacksonSerializers.LocalDateIsoSerializer.class)
+    @JsonDeserialize(using = JacksonSerializers.LocalDateIsoDeserializer.class)
+    public LocalDate deployedFeedVersionEndDate;
+
+    public Integer deployedFeedVersionIssues;
+
+    public LatestValidationResult latestValidation;
+
+    public String url;
+
+    public List<String> noteIds = new ArrayList<>();
+
+    public String organizationId;
+
+    public FeedSourceSummary() {
+    }
+
+    public FeedSourceSummary(String projectId, String organizationId, Document feedSourceDocument) {
+        this.projectId = projectId;
+        this.organizationId = organizationId;
+        this.id = feedSourceDocument.getString("_id");
+        this.name = feedSourceDocument.getString("name");
+        this.deployable = feedSourceDocument.getBoolean("deployable");
+        this.isPublic = feedSourceDocument.getBoolean("isPublic");
+        List<String> documentLabelIds = feedSourceDocument.getList("labelIds", String.class);
+        if (documentLabelIds != null) {
+            this.labelIds = documentLabelIds;
+        }
+        List<String> documentNoteIds = feedSourceDocument.getList("noteIds", String.class);
+        if (documentNoteIds != null) {
+            this.noteIds = documentNoteIds;
+        }
+        // Convert to local date type for consistency.
+        this.lastUpdated = getLocalDateFromDate(feedSourceDocument.getDate("lastUpdated"));
+        this.url = feedSourceDocument.getString("url");
+    }
+
+    /**
+     * Set the appropriate feed version. For consistency, if no error count is available set the related number of
+     * issues to null.
+     */
+    public void setFeedVersion(FeedVersionSummary feedVersionSummary, boolean isDeployed) {
+        if (feedVersionSummary != null) {
+            if (isDeployed) {
+                this.deployedFeedVersionId = feedVersionSummary.id;
+                this.deployedFeedVersionStartDate = feedVersionSummary.validationResult.firstCalendarDate;
+                this.deployedFeedVersionEndDate = feedVersionSummary.validationResult.lastCalendarDate;
+                this.deployedFeedVersionIssues = (feedVersionSummary.validationResult.errorCount == -1)
+                    ? 0
+                    : feedVersionSummary.validationResult.errorCount;
+            } else {
+                this.latestValidation = new LatestValidationResult(feedVersionSummary);
+            }
+        }
+    }
+
+    /**
+     * Get all feed source summaries matching the project id.
+     */
+    public static List<FeedSourceSummary> getFeedSourceSummaries(String projectId, String organizationId) {
+        /*
+            db.getCollection('FeedSource').aggregate([
+                {
+                    // Match provided project id.
+                    $match: {
+                        projectId: "<projectId>"
+                    }
+                },
+                {
+                    $project: {
+                        "_id": 1,
+                        "name": 1,
+                        "deployable": 1,
+                        "isPublic": 1,
+                        "lastUpdated": 1,
+                        "labelIds": 1,
+                        "url": 1,
+                        "noteIds": 1
+                    }
+                },
+                {
+                    $sort: {
+                        "name": 1
+                    }
+                }
+            ])
+         */
+        List<Bson> stages = Lists.newArrayList(
+            match(
+                in("projectId", projectId)
+            ),
+            project(
+                Projections.fields(Projections.include(
+                    "_id",
+                    "name",
+                    "deployable",
+                    "isPublic",
+                    "lastUpdated",
+                    "labelIds",
+                    "url",
+                    "noteIds")
+                )
+            ),
+            sort(Sorts.ascending("name"))
+        );
+        return extractFeedSourceSummaries(projectId, organizationId, stages);
+    }
+
+    /**
+     * Get the latest feed version from all feed sources for this project.
+     */
+    public static Map<String, FeedVersionSummary> getLatestFeedVersionForFeedSources(String projectId) {
+        /*
+            Note: To test this script:
+                1) Comment out the call to tearDownDeployedFeedVersion() in FeedSourceControllerTest -> tearDown().
+                2) Run FeedSourceControllerTest to created required objects referenced here.
+                3) Once complete, delete documents via MongoDB.
+                4) Uncomment the call to tearDownDeployedFeedVersion() in FeedSourceControllerTest -> tearDown().
+                5) Re-run FeedSourceControllerTest to confirm deletion of objects.
+
+            db.getCollection('FeedSource').aggregate([
+                {
+                    // Match provided project id.
+                    $match: {
+                        projectId: "project-with-latest-deployment"
+                    }
+                },
+                {
+                    $lookup: {
+                        from: "FeedVersion",
+                        localField: "_id",
+                        foreignField: "feedSourceId",
+                        as: "feedVersions"
+                    }
+                },
+                {
+                    $unwind: "$feedVersions"
+                },
+                {
+                    $group: {
+                        _id: "$_id",
+                        doc: {
+                            $max: {
+                                version: "$feedVersions.version",
+                                feedVersionId: "$feedVersions._id",
+                                firstCalendarDate: "$feedVersions.validationResult.firstCalendarDate",
+                                lastCalendarDate: "$feedVersions.validationResult.lastCalendarDate",
+                                issues: "$feedVersions.validationResult.errorCount"
+                            }
+                        }
+                    }
+                }
+            ])
+        */
+        List<Bson> stages = Lists.newArrayList(
+            match(
+                in("projectId", projectId)
+            ),
+            lookup("FeedVersion", "_id", "feedSourceId", "feedVersions"),
+            unwind("$feedVersions"),
+            group(
+                "$_id",
+                Accumulators.last("feedVersionId", "$feedVersions._id"),
+                Accumulators.last("firstCalendarDate", "$feedVersions.validationResult.firstCalendarDate"),
+                Accumulators.last("lastCalendarDate", "$feedVersions.validationResult.lastCalendarDate"),
+                Accumulators.last("errorCount", "$feedVersions.validationResult.errorCount")
+            )
+        );
+        return extractFeedVersionSummaries(
+            "FeedSource",
+            "feedVersionId",
+            "_id",
+            false,
+            stages);
+    }
+
+    /**
+     * Get the deployed feed versions from the latest deployment for this project.
+     */
+    public static Map<String, FeedVersionSummary> getFeedVersionsFromLatestDeployment(String projectId) {
+        /*
+            Note: To test this script:
+                1) Comment out the call to tearDownDeployedFeedVersion() in FeedSourceControllerTest -> tearDown().
+                2) Run FeedSourceControllerTest to created required objects referenced here.
+                3) Once complete, delete documents via MongoDB.
+                4) Uncomment the call to tearDownDeployedFeedVersion() in FeedSourceControllerTest -> tearDown().
+                5) Re-run FeedSourceControllerTest to confirm deletion of objects.
+
+            db.getCollection('Project').aggregate([
+                {
+                    // Match provided project id.
+                    $match: {
+                        _id: "project-with-latest-deployment"
+                    }
+                },
+                {
+                    // Get all deployments for this project.
+                    $lookup:{
+                        from:"Deployment",
+                        localField:"_id",
+                        foreignField:"projectId",
+                        as:"deployment"
+                    }
+                },
+                {
+                    // Deconstruct deployments array to a document for each element.
+                    $unwind: "$deployment"
+                },
+                {
+                    // Make the deployment documents the input/root document.
+                    "$replaceRoot": {
+                        "newRoot": "$deployment"
+                    }
+                },
+                {
+                    // Sort descending.
+                    $sort: {
+                        lastUpdated : -1
+                    }
+                },
+                {
+                    // At this point we will have the latest deployment for a project.
+                    $limit: 1
+                },
+                {
+                    $lookup:{
+                        from:"FeedVersion",
+                        localField:"feedVersionIds",
+                        foreignField:"_id",
+                        as:"feedVersions"
+                    }
+                },
+                {
+                    // Deconstruct feedVersions array to a document for each element.
+                    $unwind: "$feedVersions"
+                },
+                {
+                    // Make the feed version documents the input/root document.
+                    "$replaceRoot": {
+                        "newRoot": "$feedVersions"
+                    }
+                },
+                {
+                    $project: {
+                        "_id": 1,
+                        "feedSourceId": 1,
+                        "validationResult.firstCalendarDate": 1,
+                        "validationResult.lastCalendarDate": 1,
+                        "validationResult.errorCount": 1
+                    }
+                }
+            ])
+        */
+        List<Bson> stages = Lists.newArrayList(
+            match(
+                in("_id", projectId)
+            ),
+            lookup("Deployment", "_id", "projectId", "deployments"),
+            unwind("$deployments"),
+            replaceRoot("$deployments"),
+            sort(Sorts.descending("lastUpdated")),
+            limit(1),
+            lookup("FeedVersion", "feedVersionIds", "_id", "feedVersions"),
+            unwind("$feedVersions"),
+            replaceRoot("$feedVersions"),
+            project(
+                Projections.fields(Projections.include(
+                    "feedSourceId",
+                    "validationResult.firstCalendarDate",
+                    "validationResult.lastCalendarDate",
+                    "validationResult.errorCount")
+                )
+            )
+        );
+        return extractFeedVersionSummaries(
+            "Project",
+            "_id",
+            "feedSourceId",
+            true,
+            stages);
+    }
+
+    /**
+     * Get the deployed feed version from the pinned deployment for this feed source.
+     */
+    public static Map<String, FeedVersionSummary> getFeedVersionsFromPinnedDeployment(String projectId) {
+        /*
+            Note: To test this script:
+                1) Comment out the call to tearDownDeployedFeedVersion() in FeedSourceControllerTest -> tearDown().
+                2) Run FeedSourceControllerTest to created required objects referenced here.
+                3) Once complete, delete documents via MongoDB.
+                4) Uncomment the call to tearDownDeployedFeedVersion() in FeedSourceControllerTest -> tearDown().
+                5) Re-run FeedSourceControllerTest to confirm deletion of objects.
+
+            db.getCollection('Project').aggregate([
+                {
+                    // Match provided project id.
+                    $match: {
+                        _id: "project-with-pinned-deployment"
+                    }
+                },
+                {
+                    $project: {
+                        pinnedDeploymentId: 1
+                    }
+                },
+                {
+                    $lookup:{
+                        from:"Deployment",
+                        localField:"pinnedDeploymentId",
+                        foreignField:"_id",
+                        as:"deployment"
+                    }
+                },
+                {
+                    $unwind: "$deployment"
+                },
+                {
+                    $lookup:{
+                        from:"FeedVersion",
+                        localField:"deployment.feedVersionIds",
+                        foreignField:"_id",
+                        as:"feedVersions"
+                    }
+                },
+                {
+                    // Deconstruct feedVersions array to a document for each element.
+                    $unwind: "$feedVersions"
+                },
+                {
+                    // Make the feed version documents the input/root document.
+                    "$replaceRoot": {
+                        "newRoot": "$feedVersions"
+                    }
+                },
+                {
+                    $project: {
+                        "_id": 1,
+                        "feedSourceId": 1,
+                        "validationResult.firstCalendarDate": 1,
+                        "validationResult.lastCalendarDate": 1,
+                        "validationResult.errorCount": 1
+                    }
+                }
+            ])
+        */
+
+        List<Bson> stages = Lists.newArrayList(
+            match(
+                in("_id", projectId)
+            ),
+            project(
+                Projections.fields(Projections.include("pinnedDeploymentId"))
+            ),
+            lookup("Deployment", "pinnedDeploymentId", "_id", "deployment"),
+            unwind("$deployment"),
+            lookup("FeedVersion", "deployment.feedVersionIds", "_id", "feedVersions"),
+            unwind("$feedVersions"),
+            replaceRoot("$feedVersions"),
+            project(
+                Projections.fields(Projections.include(
+                    "feedSourceId",
+                    "validationResult.firstCalendarDate",
+                    "validationResult.lastCalendarDate",
+                    "validationResult.errorCount")
+                )
+            )
+        );
+        return extractFeedVersionSummaries(
+            "Project",
+            "_id",
+            "feedSourceId",
+            true,
+            stages);
+    }
+
+
+    /**
+     * Produce a list of all feed source summaries for a project.
+     */
+    private static List<FeedSourceSummary> extractFeedSourceSummaries(String projectId, String organizationId, List<Bson> stages) {
+        List<FeedSourceSummary> feedSourceSummaries = new ArrayList<>();
+        for (Document feedSourceDocument : Persistence.getDocuments("FeedSource", stages)) {
+            feedSourceSummaries.add(new FeedSourceSummary(projectId, organizationId, feedSourceDocument));
+        }
+        return feedSourceSummaries;
+    }
+
+    /**
+     * Extract feed version summaries from feed version documents. Each feed version is held against the matching feed
+     * source.
+     */
+    private static Map<String, FeedVersionSummary> extractFeedVersionSummaries(
+        String collection,
+        String feedVersionKey,
+        String feedSourceKey,
+        boolean hasChildValidationResultDocument,
+        List<Bson> stages
+    ) {
+        Map<String, FeedVersionSummary> feedVersionSummaries = new HashMap<>();
+        for (Document feedVersionDocument : Persistence.getDocuments(collection, stages)) {
+            FeedVersionSummary feedVersionSummary = new FeedVersionSummary();
+            feedVersionSummary.id = feedVersionDocument.getString(feedVersionKey);
+            feedVersionSummary.validationResult = getValidationResult(hasChildValidationResultDocument, feedVersionDocument);
+            feedVersionSummaries.put(feedVersionDocument.getString(feedSourceKey), feedVersionSummary);
+        }
+        return feedVersionSummaries;
+    }
+
+    /**
+     * Build validation result from feed version document.
+     */
+    private static ValidationResult getValidationResult(boolean hasChildValidationResultDocument, Document feedVersionDocument) {
+        ValidationResult validationResult = new ValidationResult();
+        validationResult.errorCount = getValidationResultErrorCount(hasChildValidationResultDocument, feedVersionDocument);
+        validationResult.firstCalendarDate = getValidationResultDate(hasChildValidationResultDocument, feedVersionDocument, "firstCalendarDate");
+        validationResult.lastCalendarDate = getValidationResultDate(hasChildValidationResultDocument, feedVersionDocument, "lastCalendarDate");
+        return validationResult;
+    }
+
+    private static LocalDate getValidationResultDate(
+        boolean hasChildValidationResultDocument,
+        Document feedVersionDocument,
+        String key
+    ) {
+        return (hasChildValidationResultDocument)
+            ? getDateFieldFromDocument(feedVersionDocument, key)
+            : getDateFromString(feedVersionDocument.getString(key));
+    }
+
+    /**
+     * Extract date value from validation result document.
+     */
+    private static LocalDate getDateFieldFromDocument(Document document, String dateKey) {
+        Document validationResult = getDocumentChild(document, "validationResult");
+        return (validationResult != null)
+            ? getDateFromString(validationResult.getString(dateKey))
+            : null;
+    }
+
+    /**
+     * Extract the error count from the parent document or child validation result document. If the error count is not
+     * available, return -1.
+     */
+    private static int getValidationResultErrorCount(boolean hasChildValidationResultDocument, Document feedVersionDocument) {
+        int errorCount;
+        try {
+            errorCount = (hasChildValidationResultDocument)
+                ? getErrorCount(feedVersionDocument)
+                : feedVersionDocument.getInteger("errorCount");
+        } catch (NullPointerException e) {
+            errorCount = -1;
+        }
+        return errorCount;
+    }
+
+    /**
+     * Get the child validation result document and extract the error count from this.
+     */
+    private static int getErrorCount(Document document) {
+        return getDocumentChild(document, "validationResult").getInteger("errorCount");
+    }
+
+    /**
+     * Extract child document matching provided name.
+     */
+    private static Document getDocumentChild(Document document, String name) {
+        return (Document) document.get(name);
+    }
+
+    /**
+     * Convert String date (if not null) into LocalDate.
+     */
+    private static LocalDate getDateFromString(String date) {
+        return (date == null) ? null : LocalDate.parse(date, formatter);
+    }
+
+    /**
+     * Convert Date object into LocalDate object.
+     */
+    private static LocalDate getLocalDateFromDate(Date date) {
+        return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+    }
+
+    public static class LatestValidationResult {
+
+        public String feedVersionId;
+        @JsonSerialize(using = JacksonSerializers.LocalDateIsoSerializer.class)
+        @JsonDeserialize(using = JacksonSerializers.LocalDateIsoDeserializer.class)
+        public LocalDate startDate;
+
+        @JsonSerialize(using = JacksonSerializers.LocalDateIsoSerializer.class)
+        @JsonDeserialize(using = JacksonSerializers.LocalDateIsoDeserializer.class)
+        public LocalDate endDate;
+
+        public Integer errorCount;
+
+        /**
+         * Required for JSON de/serializing.
+         **/
+        public LatestValidationResult() {
+        }
+
+        LatestValidationResult(FeedVersionSummary feedVersionSummary) {
+            this.feedVersionId = feedVersionSummary.id;
+            this.startDate = feedVersionSummary.validationResult.firstCalendarDate;
+            this.endDate = feedVersionSummary.validationResult.lastCalendarDate;
+            this.errorCount = (feedVersionSummary.validationResult.errorCount == -1)
+                ? null
+                : feedVersionSummary.validationResult.errorCount;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java b/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java
index 41a8a192e..bb87c6187 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java
@@ -3,13 +3,17 @@
 import com.conveyal.datatools.common.status.MonitorableJob;
 import com.conveyal.datatools.common.utils.Scheduler;
 import com.conveyal.datatools.manager.DataManager;
+import com.conveyal.datatools.manager.jobs.ValidateFeedJob;
+import com.conveyal.datatools.manager.jobs.ValidateMobilityDataFeedJob;
 import com.conveyal.datatools.manager.jobs.validation.RouteTypeValidatorBuilder;
+import com.conveyal.datatools.manager.jobs.validation.SharedStopsValidator;
 import com.conveyal.datatools.manager.persistence.FeedStore;
 import com.conveyal.datatools.manager.persistence.Persistence;
 import com.conveyal.datatools.manager.utils.HashUtils;
 import com.conveyal.gtfs.BaseGTFSCache;
 import com.conveyal.gtfs.GTFS;
 import com.conveyal.gtfs.error.NewGTFSErrorType;
+import com.conveyal.gtfs.graphql.fetchers.JDBCFetcher;
 import com.conveyal.gtfs.loader.Feed;
 import com.conveyal.gtfs.loader.FeedLoadResult;
 import com.conveyal.gtfs.validator.MTCValidator;
@@ -20,14 +24,22 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
+import org.bson.Document;
 import org.bson.codecs.pojo.annotations.BsonProperty;
+import org.mobilitydata.gtfsvalidator.runner.ApplicationType;
+import org.mobilitydata.gtfsvalidator.runner.ValidationRunner;
+import org.mobilitydata.gtfsvalidator.runner.ValidationRunnerConfig;
+import org.mobilitydata.gtfsvalidator.util.VersionResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -253,6 +265,8 @@ public FeedValidationResultSummary validationSummary() {
      * */
     public Date processedByExternalPublisher;
 
+    public Document mobilityDataResult;
+
     public String formattedTimestamp() {
         SimpleDateFormat format = new SimpleDateFormat(HUMAN_READABLE_TIMESTAMP_FORMAT);
         return format.format(this.updated);
@@ -344,22 +358,47 @@ public void validate(MonitorableJob.Status status) {
         // Sometimes this method is called when no status object is available.
         if (status == null) status = new MonitorableJob.Status();
 
-        // VALIDATE GTFS feed
+        // VALIDATE GTFS feed.
         try {
             LOG.info("Beginning validation...");
+
             // FIXME: pass status to validate? Or somehow listen to events?
             status.update("Validating feed...", 33);
 
             // Validate the feed version.
-            // Certain extensions, if enabled, have extra validators
+            // Certain extensions, if enabled, have extra validators.
             if (isExtensionEnabled("mtc")) {
                 validationResult = GTFS.validate(feedLoadResult.uniqueIdentifier, DataManager.GTFS_DATA_SOURCE,
                     RouteTypeValidatorBuilder::buildRouteValidator,
                     MTCValidator::new
                 );
             } else {
-                validationResult = GTFS.validate(feedLoadResult.uniqueIdentifier, DataManager.GTFS_DATA_SOURCE,
-                    RouteTypeValidatorBuilder::buildRouteValidator
+                FeedSource fs = Persistence.feedSources.getById(this.feedSourceId);
+
+                /*
+                  Get feed_id from feed version
+
+                  This could potentially happen inside gtfs-lib, however
+                  because this functionality is specific to datatools and the
+                  shared stops feature, it lives only here instead. Changes to
+                  gtfs-lib have been avoided, so that gtfs-lib isn't being modified
+                  to support proprietary features.
+                 */
+                JDBCFetcher feedFetcher = new JDBCFetcher("feed_info");
+                Object gtfsFeedId = new Object();
+                try {
+                    gtfsFeedId = feedFetcher.getResults(this.namespace, null, null).get(0).get("feed_id");
+                } catch (RuntimeException e) {
+                    LOG.warn("RuntimeException occurred while fetching feedId");
+                }
+                String feedId = gtfsFeedId == null ? "" : gtfsFeedId.toString();
+                SharedStopsValidator ssv = new SharedStopsValidator(fs.retrieveProject(), feedId);
+
+                validationResult = GTFS.validate(
+                        feedLoadResult.uniqueIdentifier,
+                        DataManager.GTFS_DATA_SOURCE,
+                        RouteTypeValidatorBuilder::buildRouteValidator,
+                        ssv::buildSharedStopsValidator
                 );
             }
         } catch (Exception e) {
@@ -370,6 +409,54 @@ public void validate(MonitorableJob.Status status) {
         }
     }
 
+    public void validateMobility(MonitorableJob.Status status) {
+
+        // Sometimes this method is called when no status object is available.
+        if (status == null) status = new MonitorableJob.Status();
+
+        // VALIDATE GTFS feed
+        try {
+            LOG.info("Beginning MobilityData validation...");
+            status.update("MobilityData Analysis...", 11);
+
+            // Wait for the file to be entirely copied into the directory.
+            // 5 seconds + ~1 second per 10mb
+            Thread.sleep(5000 + (this.fileSize / 10000));
+            File gtfsZip = this.retrieveGtfsFile();
+            // Namespace based folders avoid clash for validation being run on multiple versions of a feed.
+            // TODO: do we know that there will always be a namespace?
+            String validatorOutputDirectory = "/tmp/datatools_gtfs/" + this.namespace + "/";
+
+            status.update("MobilityData Analysis...", 20);
+            // Set up MobilityData validator.
+            ValidationRunnerConfig.Builder builder = ValidationRunnerConfig.builder();
+            builder.setGtfsSource(gtfsZip.toURI());
+            builder.setOutputDirectory(Path.of(validatorOutputDirectory));
+            ValidationRunnerConfig mbValidatorConfig = builder.build();
+
+            status.update("MobilityData Analysis...", 40);
+            // Run MobilityData validator
+            ValidationRunner runner = new ValidationRunner(new VersionResolver(ApplicationType.CLI));
+            runner.run(mbValidatorConfig);
+
+            status.update("MobilityData Analysis...", 80);
+            // Read generated report and save to Mongo.
+            String json;
+            try (FileReader fr = new FileReader(validatorOutputDirectory + "report.json")) {
+                BufferedReader in = new BufferedReader(fr);
+                json = in.lines().collect(Collectors.joining(System.lineSeparator()));
+            }
+
+            // This will persist the document to Mongo.
+            this.mobilityDataResult = Document.parse(json);
+        } catch (Exception e) {
+            status.fail(String.format("Unable to validate feed %s", this.id), e);
+            // FIXME create validation result with new constructor?
+            validationResult = new ValidationResult();
+            validationResult.fatalException = "failure!";
+        }
+    }
+
     public void validate() {
         validate(null);
     }
@@ -429,7 +516,9 @@ public boolean hasBlockingIssuesForPublishing() {
             NewGTFSErrorType.SERVICE_WITHOUT_DAYS_OF_WEEK,
             NewGTFSErrorType.TABLE_MISSING_COLUMN_HEADERS,
             NewGTFSErrorType.TABLE_IN_SUBDIRECTORY,
-            NewGTFSErrorType.WRONG_NUMBER_OF_FIELDS
+            NewGTFSErrorType.WRONG_NUMBER_OF_FIELDS,
+            NewGTFSErrorType.MULTIPLE_SHARED_STOPS_GROUPS,
+            NewGTFSErrorType.SHARED_STOP_GROUP_MULTIPLE_PRIMARY_STOPS
         ));
     }
 
@@ -558,4 +647,19 @@ public void assignGtfsFileAttributes(File newGtfsFile) {
     public boolean isSameAs(FeedVersion otherVersion) {
         return otherVersion != null && this.hash.equals(otherVersion.hash);
     }
+
+    /**
+     * {@link ValidateFeedJob} and {@link ValidateMobilityDataFeedJob} both require to save a feed version after their
+     * subsequent validation checks have completed. Either could finish first, therefore this method makes sure that
+     * only one instance is saved (the last to finish updates).
+     */
+    public void persistFeedVersionAfterValidation(boolean isNewVersion) {
+        if (isNewVersion && Persistence.feedVersions.getById(id) == null) {
+            int count = parentFeedSource().feedVersionCount();
+            version = count + 1;
+            Persistence.feedVersions.create(this);
+        } else {
+            Persistence.feedVersions.replace(id, this);
+        }
+    }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/models/FeedVersionSummary.java b/src/main/java/com/conveyal/datatools/manager/models/FeedVersionSummary.java
index 54fe453a8..be2413a9a 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/FeedVersionSummary.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/FeedVersionSummary.java
@@ -56,8 +56,11 @@ public class PartialValidationSummary {
         public LocalDate endDate;
 
         PartialValidationSummary() {
-            this.startDate = validationResult.firstCalendarDate;
-            this.endDate = validationResult.lastCalendarDate;
+            // Older feeds created in datatools may not have validationResult
+            if (validationResult != null) {
+                this.startDate = validationResult.firstCalendarDate;
+                this.endDate = validationResult.lastCalendarDate;
+            }
         }
     }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/models/Label.java b/src/main/java/com/conveyal/datatools/manager/models/Label.java
index 8bf239798..46c265f54 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/Label.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/Label.java
@@ -39,7 +39,7 @@ public String organizationId () {
     public Auth0UserProfile user;
 
     /**
-     * Create a new label
+     * Create a new label with auto-gen id.
      */
     public Label (String name, String description, String color, boolean adminOnly, String projectId) {
         super();
@@ -47,10 +47,17 @@ public Label (String name, String description, String color, boolean adminOnly,
         this.description = description != null ? description : "";
         this.color = color != null ? color : "#000000";
         this.adminOnly = adminOnly;
-
         this.projectId = projectId;
     }
 
+    /**
+     * Create a new label with provided id.
+     */
+    public Label (String id, String name, String description, String color, boolean adminOnly, String projectId) {
+        this(name, description, color, adminOnly, projectId);
+        this.id = id;
+    }
+
     /**
      * No-arg constructor to yield an uninitialized label, for dump/restore.
      * Should not be used in general code.
diff --git a/src/main/java/com/conveyal/datatools/manager/models/Note.java b/src/main/java/com/conveyal/datatools/manager/models/Note.java
index 87b5f452f..d6a745dd6 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/Note.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/Note.java
@@ -32,6 +32,19 @@ public class Note extends Model implements Serializable {
     /** Whether the note should be visible to project admins only */
     public boolean adminOnly;
 
+    /**
+     * Create a new note with provided id.
+     */
+    public Note(String id, String body, boolean adminOnly) {
+        super();
+        this.id = id;
+        this.body = body;
+        this.adminOnly = adminOnly;
+    }
+
+    public Note() {
+    }
+
     /**
      * The types of object that can have notes recorded on them.
      */
diff --git a/src/main/java/com/conveyal/datatools/manager/models/OtpBuildConfig.java b/src/main/java/com/conveyal/datatools/manager/models/OtpBuildConfig.java
index 760a0a11f..d0f385ef4 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/OtpBuildConfig.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/OtpBuildConfig.java
@@ -6,28 +6,11 @@
 
 /**
  * Created by demory on 3/8/15.
+ *
+ * TODO: Figure out how to remove this class without causing problems in the DB migration
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class OtpBuildConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    public Boolean fetchElevationUS;
-    // FIXME: elevation bucket causing NPE issue if missing values when deploying to OTP
-    // public S3Bucket elevationBucket;
-
-    public Boolean stationTransfers;
-
-    public Double subwayAccessTime;
-
-    /** Currently only supports no-configuration fares, e.g. New York or San Francisco */
-    public String fares;
-
-    public OtpBuildConfig() {}
-
-    public static class S3Bucket implements Serializable {
-        private static final long serialVersionUID = 1L;
-        public String accessKey;
-        public String secretKey;
-        public String bucketName;
-    }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/models/OtpRouterConfig.java b/src/main/java/com/conveyal/datatools/manager/models/OtpRouterConfig.java
index 1a5b342a5..da2d1961d 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/OtpRouterConfig.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/OtpRouterConfig.java
@@ -7,32 +7,11 @@
 
 /**
  * Created by demory on 3/8/15.
+ *
+ * TODO: Figure out how to remove this class without causing problems in the DB migration
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class OtpRouterConfig implements Serializable {
     private static final long serialVersionUID = 1L;
-    public Integer numItineraries;
 
-    public Double  walkSpeed;
-
-    public Double stairsReluctance;
-
-    public Double carDropoffTime;
-
-    public Collection<Updater> updaters;
-
-    public static class Updater implements Serializable {
-        private static final long serialVersionUID = 1L;
-        public String type;
-
-        public Integer frequencySec;
-
-        public String sourceType;
-
-        public String url;
-
-        public String defaultAgencyId;
-    }
-    
-    public String requestLogFile;
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/models/Project.java b/src/main/java/com/conveyal/datatools/manager/models/Project.java
index 28b3d677e..073405297 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/Project.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/Project.java
@@ -2,9 +2,14 @@
 
 import com.conveyal.datatools.manager.jobs.AutoDeployType;
 import com.conveyal.datatools.manager.persistence.Persistence;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.Lists;
+import com.mongodb.client.model.Projections;
+import org.bson.Document;
 import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.conversions.Bson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,10 +17,15 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
+import static com.mongodb.client.model.Aggregates.match;
+import static com.mongodb.client.model.Aggregates.project;
 import static com.mongodb.client.model.Filters.and;
 import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.in;
 import static com.mongodb.client.model.Filters.or;
 
 /**
@@ -37,15 +47,15 @@ public class Project extends Model {
 
     public boolean useCustomOsmBounds;
 
-    public OtpBuildConfig buildConfig;
-
-    public OtpRouterConfig routerConfig;
-
     public String organizationId;
 
     /** Last successful auto deploy. **/
     public Date lastAutoDeploy;
 
+    /** CSV formatted shared stops config. **/
+    public String sharedStopsConfig;
+
+
     /**
      * A list of servers that are available to deploy project feeds/OSM to. This includes servers assigned to this
      * project as well as those that belong to no project.
@@ -97,8 +107,6 @@ public List<OtpServer> availableOtpServers() {
 
 
     public Project() {
-        this.buildConfig = new OtpBuildConfig();
-        this.routerConfig = new OtpRouterConfig();
         this.useCustomOsmBounds = false;
     }
 
@@ -124,6 +132,14 @@ public Collection<Label> retrieveProjectLabels(boolean isAdmin) {
     @BsonIgnore
     public Collection<Label> labels;
 
+    @JsonProperty
+    public long feedSourceCount() {
+        if (retrieveProjectFeedSources() == null) {
+            return -1;
+        }
+        return Persistence.feedSources.count(eq("projectId", this.id));
+    }
+
 
     // Note: Previously a numberOfFeeds() dynamic Jackson JsonProperty was in place here. But when the number of projects
     // in the database grows large, the efficient calculation of this field does not scale.
@@ -135,6 +151,36 @@ public Collection<Deployment> retrieveDeployments() {
         return Persistence.deployments.getFiltered(eq("projectId", this.id));
     }
 
+    /**
+     * Get all deployment summaries for this project.
+     */
+    public Collection<DeploymentSummary> retrieveDeploymentSummaries() {
+        Collection<Deployment> deployments = retrieveDeployments();
+        List<OtpServer> otpServers = availableOtpServers();
+        return deployments
+            .stream()
+            .map(deployment -> new DeploymentSummary(deployment, this, otpServers))
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * Get all feed source summaries for this project.
+     */
+    public Collection<FeedSourceSummary> retrieveFeedSourceSummaries() {
+        List<FeedSourceSummary> feedSourceSummaries = FeedSourceSummary.getFeedSourceSummaries(id, organizationId);
+        Map<String, FeedVersionSummary> latestFeedVersionForFeedSources = FeedSourceSummary.getLatestFeedVersionForFeedSources(id);
+        Map<String, FeedVersionSummary> deployedFeedVersions = FeedSourceSummary.getFeedVersionsFromPinnedDeployment(id);
+        if (deployedFeedVersions.isEmpty()) {
+            // No pinned deployments, instead, get the deployed feed versions from the latest deployment.
+            deployedFeedVersions = FeedSourceSummary.getFeedVersionsFromLatestDeployment(id);
+        }
+        for (FeedSourceSummary feedSourceSummary : feedSourceSummaries) {
+            feedSourceSummary.setFeedVersion(latestFeedVersionForFeedSources.get(feedSourceSummary.id), false);
+            feedSourceSummary.setFeedVersion(deployedFeedVersions.get(feedSourceSummary.id), true);
+        }
+        return feedSourceSummaries;
+    }
+
     // TODO: Does this need to be returned with JSON API response
     public Organization retrieveOrganization() {
         if (organizationId != null) {
@@ -169,4 +215,38 @@ public abstract static class ProjectWithOtpServers {
         @JsonProperty("otpServers")
         public abstract Collection<OtpServer> availableOtpServers ();
     }
+
+    @BsonIgnore
+    @JsonIgnore
+    public static boolean hasPinnedDeployment(String projectId) {
+        /*
+            db.getCollection('Project').aggregate([
+                {
+                    // Match provided project id.
+                    $match: {
+                        _id: "project-with-latest-deployment"
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        pinnedDeploymentId: 1
+                    }
+                }
+            ])
+        */
+        List<Bson> stages = Lists.newArrayList(
+            match(
+                in("_id", projectId)
+            ),
+            project(Projections.excludeId()),
+            project(Projections.include("pinnedDeploymentId"))
+        );
+        Document project = Persistence
+            .getMongoDatabase()
+            .getCollection("Project")
+            .aggregate(stages)
+            .first();
+        return !project.isEmpty();
+    }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/models/TableTransformResult.java b/src/main/java/com/conveyal/datatools/manager/models/TableTransformResult.java
index c8560e86e..0ff2b0622 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/TableTransformResult.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/TableTransformResult.java
@@ -11,6 +11,7 @@ public class TableTransformResult implements Serializable {
     public int deletedCount;
     public int updatedCount;
     public int addedCount;
+    public int customColumnsAdded;
     public TransformType transformType;
     public String tableName;
 
@@ -21,6 +22,22 @@ public TableTransformResult(String tableName, TransformType transformType) {
         this.transformType = transformType;
     }
 
+    public TableTransformResult(
+            String tableName,
+            TransformType transformType,
+            int deletedCount,
+            int updatedCount,
+            int addedCount,
+            int customColumnsAdded
+    ) {
+        this.tableName = tableName;
+        this.transformType = transformType;
+        this.deletedCount = deletedCount;
+        this.updatedCount = updatedCount;
+        this.addedCount = addedCount;
+        this.customColumnsAdded = customColumnsAdded;
+    }
+
     public TableTransformResult(String tableName, int deletedCount, int updatedCount, int addedCount) {
         this.tableName = tableName;
         this.transformType = TransformType.TABLE_MODIFIED;
@@ -28,4 +45,4 @@ public TableTransformResult(String tableName, int deletedCount, int updatedCount
         this.updatedCount = updatedCount;
         this.addedCount = addedCount;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/AddCustomFileFromStringTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/AddCustomFileFromStringTransformation.java
new file mode 100644
index 000000000..6d336aa6b
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/AddCustomFileFromStringTransformation.java
@@ -0,0 +1,24 @@
+package com.conveyal.datatools.manager.models.transform;
+
+import com.conveyal.datatools.common.status.MonitorableJob;
+
+public class AddCustomFileFromStringTransformation extends StringTransformation {
+
+    // Additional create method required to ensure transformation type is AddCustomFile in tests.
+    // Otherwise, we'd use the StringTransformation#create which doesn't differentiate types and hence
+    // would fail table name tests.
+    public static AddCustomFileFromStringTransformation create(String csvData, String table) {
+        AddCustomFileFromStringTransformation transformation = new AddCustomFileFromStringTransformation();
+        transformation.csvData = csvData;
+        transformation.table = table;
+        return transformation;
+    }
+
+    @Override
+    public void validateTableName(MonitorableJob.Status status) {
+        if (table.contains(".txt")) {
+            status.fail("CSV Table name should not contain .txt");
+        }
+    }
+
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/AppendToFileTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/AppendToFileTransformation.java
new file mode 100644
index 000000000..68f7cb9d4
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/AppendToFileTransformation.java
@@ -0,0 +1,103 @@
+
+package com.conveyal.datatools.manager.models.transform;
+
+import com.conveyal.datatools.common.status.MonitorableJob;
+import com.conveyal.datatools.manager.models.TableTransformResult;
+import com.conveyal.datatools.manager.models.TransformType;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+public class AppendToFileTransformation extends ZipTransformation {
+
+    public static AppendToFileTransformation create(String csvData, String table) {
+        AppendToFileTransformation transformation = new AppendToFileTransformation();
+        transformation.csvData = csvData;
+        transformation.table = table;
+        return transformation;
+    }
+
+    @Override
+    public void validateParameters(MonitorableJob.Status status) {
+        if (csvData == null) {
+            status.fail("CSV data must not be null");
+        }
+    }
+
+    @Override
+    public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status status) {
+        String tableName = table + ".txt";
+        Path targetZipPath = Paths.get(zipTarget.gtfsFile.getAbsolutePath());
+
+        try (
+            FileSystem targetZipFs = FileSystems.newFileSystem(targetZipPath, (ClassLoader) null);
+            InputStream newLineStream = new ByteArrayInputStream("\n".getBytes(StandardCharsets.UTF_8));
+            InputStream inputStream = new ByteArrayInputStream(csvData.getBytes(StandardCharsets.UTF_8));
+        ) {
+            TransformType type = TransformType.TABLE_MODIFIED;
+
+            Path targetTxtFilePath = getTablePathInZip(tableName, targetZipFs);
+
+            final File tempFile = File.createTempFile(tableName + "-temp", ".txt");
+            final File tempFileWithStrippedNewlines = File.createTempFile(tableName + "-temp-no-newlines", ".txt");
+            Files.copy(targetTxtFilePath, tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+
+            // Append CSV data into the target file in the temporary copy of file
+            try (OutputStream os = new FileOutputStream(tempFile, true)) {
+                os.write(newLineStream.readAllBytes());
+                os.write(inputStream.readAllBytes());
+                os.flush();
+
+            } catch (Exception e) {
+                status.fail("Failed to write to target file", e);
+            }
+
+
+            // Re-write file without extra line breaks
+            try (
+                OutputStream noNewlineOs = new FileOutputStream(tempFileWithStrippedNewlines, false);
+                FileReader fr = new FileReader(tempFile);
+                BufferedReader br = new BufferedReader(fr);
+            ) {
+                String line;
+                while ((line = br.readLine()) != null) {
+                    if (line.matches("\n") || line.isEmpty()) {
+                        continue;
+                    }
+
+                    noNewlineOs.write(line.getBytes());
+                    noNewlineOs.write("\n".getBytes());
+                }
+                noNewlineOs.flush();
+            }
+
+            // Copy modified file into zip
+            Files.copy(tempFileWithStrippedNewlines.toPath(), targetTxtFilePath, StandardCopyOption.REPLACE_EXISTING);
+
+            final int NEW_LINE_CHARACTER_CODE = 10;
+            int lineCount = (int) csvData.chars().filter(c -> c == NEW_LINE_CHARACTER_CODE).count();
+            zipTarget.feedTransformResult.tableTransformResults.add(new TableTransformResult(
+                    tableName,
+                    type,
+                    0,
+                    0,
+                    lineCount + 1,
+                    0
+            ));
+        } catch (Exception e) {
+            status.fail("Unknown error encountered while transforming zip file", e);
+        }
+    }
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/FeedTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/FeedTransformation.java
index 0433fa457..bed22f506 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/transform/FeedTransformation.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/FeedTransformation.java
@@ -30,7 +30,10 @@
     @JsonSubTypes.Type(value = DeleteRecordsTransformation.class, name = "DeleteRecordsTransformation"),
     @JsonSubTypes.Type(value = NormalizeFieldTransformation.class, name = "NormalizeFieldTransformation"),
     @JsonSubTypes.Type(value = ReplaceFileFromVersionTransformation.class, name = "ReplaceFileFromVersionTransformation"),
-    @JsonSubTypes.Type(value = ReplaceFileFromStringTransformation.class, name = "ReplaceFileFromStringTransformation")
+    @JsonSubTypes.Type(value = ReplaceFileFromStringTransformation.class, name = "ReplaceFileFromStringTransformation"),
+    @JsonSubTypes.Type(value = PreserveCustomFieldsTransformation.class, name = "PreserveCustomFieldsTransformation"),
+    @JsonSubTypes.Type(value = AddCustomFileFromStringTransformation.class, name = "AddCustomFileTransformation"),
+    @JsonSubTypes.Type(value = AppendToFileTransformation.class, name = "AppendToFileTransformation")
 })
 public abstract class FeedTransformation<Target extends FeedTransformTarget> implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -68,6 +71,8 @@ public void doTransform(FeedTransformTarget target, MonitorableJob.Status status
             status.fail(
                 String.format("Transformation must be of type '%s'.", getTransformationTypeName())
             );
+        } catch (Exception e) {
+            status.fail(e.toString());
         }
     }
 
@@ -78,7 +83,7 @@ public void doTransform(FeedTransformTarget target, MonitorableJob.Status status
      * @param target The database-bound or ZIP-file-bound target the transformation will operate on.
      * @param status Used to report success or failure status and details.
      */
-    public abstract void transform(Target target, MonitorableJob.Status status);
+    public abstract void transform(Target target, MonitorableJob.Status status) throws Exception;
 
     /**
      * At the moment, used by DbTransformation to validate field names.
@@ -98,7 +103,6 @@ protected void validateTableName(MonitorableJob.Status status) {
         // Validate fields before running transform.
         if (GtfsUtils.getGtfsTable(table) == null) {
             status.fail("Table must be valid GTFS spec table name (without .txt).");
-            return;
         }
     }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformation.java
index 7e9cd390d..e9c4d6ce7 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformation.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformation.java
@@ -198,10 +198,15 @@ public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status st
             Field[] fieldsFoundInZip = gtfsTable.getFieldsFromFieldHeaders(headers, null);
             int transformFieldIndex = getFieldIndex(fieldsFoundInZip, fieldName);
 
+            // If the index is -1, this is a new column, and we need to add it accordingly.
+            if (transformFieldIndex == -1) {
+                writer.write(expandArray(headers, fieldName));
+            } else {
+                writer.write(headers);
+            }
+
             int modifiedRowCount = 0;
 
-            // Write headers and processed CSV rows.
-            writer.write(headers);
             while (csvReader.readRecord()) {
                 String originalValue = csvReader.get(transformFieldIndex);
                 String transformedValue = originalValue;
@@ -219,10 +224,16 @@ public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status st
 
                 // Re-assemble the CSV line and place in buffer.
                 String[] csvValues = csvReader.getValues();
-                csvValues[transformFieldIndex] = transformedValue;
 
-                // Write line to table (plus new line char).
-                writer.write(csvValues);
+                // If the index is -1, this is a new column, and we need to add it accordingly.
+                if (transformFieldIndex == -1) {
+                    writer.write(expandArray(csvValues, transformedValue));
+                } else {
+                    csvValues[transformFieldIndex] = transformedValue;
+
+                    // Write line to table (plus new line char).
+                    writer.write(csvValues);
+                }
 
                 // Count number of CSV rows changed.
                 if (!originalValue.equals(transformedValue)) {
@@ -235,7 +246,7 @@ public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status st
             // Copy csv input stream into the zip file, replacing the existing file.
             try (
                 // Modify target zip file that we just read.
-                FileSystem targetZipFs = FileSystems.newFileSystem(tempZipPath, null);
+                FileSystem targetZipFs = FileSystems.newFileSystem(tempZipPath, (ClassLoader) null);
                 // Stream for file copy operation.
                 InputStream inputStream =  new ByteArrayInputStream(stringWriter.toString().getBytes(StandardCharsets.UTF_8))
             ) {
@@ -287,4 +298,14 @@ public String performSubstitutions(String inputString) {
         }
         return result;
     }
+
+    /**
+     * Copies a fixed length array, and appends a new element at the end.
+     */
+    private String[] expandArray(String[] array, String value) {
+        String[] expanded = new String[array.length + 1];
+        System.arraycopy(array, 0, expanded, 0, array.length);
+        expanded[array.length] = value;
+        return expanded;
+    }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/PreserveCustomFieldsTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/PreserveCustomFieldsTransformation.java
new file mode 100644
index 000000000..e247d2db3
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/PreserveCustomFieldsTransformation.java
@@ -0,0 +1,138 @@
+package com.conveyal.datatools.manager.models.transform;
+
+import com.conveyal.datatools.common.status.MonitorableJob;
+import com.conveyal.datatools.manager.models.TableTransformResult;
+import com.conveyal.datatools.manager.models.TransformType;
+import org.supercsv.io.CsvMapReader;
+import com.conveyal.gtfs.loader.Table;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.StringReader;
+import java.io.IOException;
+import java.nio.file.*;
+import java.util.*;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.supercsv.io.CsvMapWriter;
+import org.supercsv.prefs.CsvPreference;
+
+
+/**
+ * This feed transformation will attempt to preserve any custom fields from an entered csv in the final GTFS output.
+ */
+public class PreserveCustomFieldsTransformation extends ZipTransformation {
+    /** no-arg constructor for de/serialization */
+    public PreserveCustomFieldsTransformation() {}
+
+    public static PreserveCustomFieldsTransformation create(String csvData, String table) {
+        PreserveCustomFieldsTransformation transformation = new PreserveCustomFieldsTransformation();
+        transformation.csvData = csvData;
+        transformation.table = table;
+        return transformation;
+    }
+
+    @Override
+    public void validateParameters(MonitorableJob.Status status) {
+        if (csvData == null) {
+            status.fail("CSV data must not be null (delete table not yet supported)");
+        }
+    }
+
+    /**
+     * This method creates a hash map of the GTFS table keys to the custom CSV values for efficient lookup of custom values.
+     * The hash map key is the key values of the GTFS table (e.g. stop_id for stops) concatenated by an underscore.
+     * The hash map value is the CsvMapReader (mapping of column to row value).
+     */
+    private static HashMap<String, Map<String, String>> createCsvHashMap(CsvMapReader reader, String[] headers, List<String> tablePrimaryKeys) throws IOException {
+        HashMap<String, Map<String, String>> lookup = new HashMap<>();
+        Map<String, String> nextLine;
+        while ((nextLine = reader.read(headers)) != null) {
+            List<String> customCsvKeyValues = tablePrimaryKeys.stream().map(nextLine::get).collect(Collectors.toList());
+            String hashKey = StringUtils.join(customCsvKeyValues, "_");
+            lookup.put(hashKey, nextLine);
+        }
+        return lookup;
+    }
+
+    @Override
+    public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status status) throws Exception{
+        String tableName = table + ".txt";
+        Path targetZipPath = Paths.get(zipTarget.gtfsFile.getAbsolutePath());
+        Optional<Table> streamResult = Arrays.stream(Table.tablesInOrder)
+                .filter(t -> t.name.equals(table))
+                .findFirst();
+
+        if (!streamResult.isPresent()) {
+            throw new Exception(String.format("could not find specTable for table %s", table));
+        }
+        Table specTable = streamResult.get();
+
+        try (FileSystem targetZipFs = FileSystems.newFileSystem(targetZipPath, (ClassLoader) null)) {
+            List<String> specTableFields = specTable.specFields().stream().map(f -> f.name).collect(Collectors.toList());
+            List<String> tablePrimaryKeys = specTable.getPrimaryKeyNames();
+
+            Path targetTxtFilePath = getTablePathInZip(tableName, targetZipFs);
+
+            final File tempFile = File.createTempFile(tableName + "-temp", ".txt");
+            File output = File.createTempFile(tableName + "-output-temp", ".txt");
+            int rowsModified = 0;
+            List<String> customFields;
+
+            try (
+                InputStream is = Files.newInputStream(targetTxtFilePath);
+                CsvMapReader customFileReader = new CsvMapReader(new StringReader(csvData), CsvPreference.STANDARD_PREFERENCE);
+                CsvMapReader editorFileReader = new CsvMapReader(new InputStreamReader(is), CsvPreference.STANDARD_PREFERENCE);
+                CsvMapWriter writer = new CsvMapWriter(new FileWriter(output), CsvPreference.STANDARD_PREFERENCE);
+            ){
+
+                String[] customHeaders = customFileReader.getHeader(true);
+                String[] editorHeaders = editorFileReader.getHeader(true);
+
+                customFields = Arrays.stream(customHeaders).filter(h -> !specTableFields.contains(h)).collect(Collectors.toList());
+                if (customFields.isEmpty()) return;
+                String[] fullHeaders = ArrayUtils.addAll(editorHeaders, customFields.toArray(new String[0]));
+
+                HashMap<String, Map<String, String>> customFieldsLookup = createCsvHashMap(customFileReader, customHeaders, tablePrimaryKeys);
+                writer.writeHeader(fullHeaders);
+
+                Map<String, String> row;
+                while ((row = editorFileReader.read(editorHeaders)) != null) {
+                    List<String> editorCsvPrimaryKeyValues = tablePrimaryKeys.stream()
+                        .map(row::get)
+                        .collect(Collectors.toList());
+
+                    String hashKey = StringUtils.join(editorCsvPrimaryKeyValues, "_");
+                    Map<String, String> customCsvValues = customFieldsLookup.get(hashKey);
+                    Map<String, String> finalRow = row;
+                    customFields.forEach(customField -> {
+                        String value = customCsvValues == null ? null : customCsvValues.get(customField);
+                        finalRow.put(customField, value);
+                    });
+                    if (customCsvValues != null) rowsModified++;
+                    writer.write(finalRow, fullHeaders);
+                }
+            }
+            Files.copy(output.toPath(), targetTxtFilePath, StandardCopyOption.REPLACE_EXISTING);
+            tempFile.deleteOnExit();
+            output.deleteOnExit();
+            zipTarget.feedTransformResult.tableTransformResults.add(new TableTransformResult(
+                    tableName,
+                    TransformType.TABLE_MODIFIED,
+                    0,
+                    rowsModified,
+                    0,
+                    customFields.size()
+            ));
+        } catch (NoSuchFileException e) {
+            status.fail("Source version does not contain table: " + tableName, e);
+        } catch (IOException e) {
+            status.fail("An exception occurred when writing output with custom fields", e);
+        } catch (Exception e) {
+            status.fail("Unknown error encountered while transforming zip file", e);
+        }
+    }
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/ReplaceFileFromStringTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/ReplaceFileFromStringTransformation.java
index 5673d0c05..823dbc5f5 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/transform/ReplaceFileFromStringTransformation.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/ReplaceFileFromStringTransformation.java
@@ -1,60 +1,9 @@
 package com.conveyal.datatools.manager.models.transform;
 
 import com.conveyal.datatools.common.status.MonitorableJob;
-import com.conveyal.datatools.manager.models.TableTransformResult;
-import com.conveyal.datatools.manager.models.TransformType;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 
 /**
  * This feed transformation will replace a file in the target zip (table) with the provided csv data.
  */
-public class ReplaceFileFromStringTransformation extends ZipTransformation {
-
-    public static ReplaceFileFromStringTransformation create(String csvData, String table) {
-        ReplaceFileFromStringTransformation transformation = new ReplaceFileFromStringTransformation();
-        transformation.csvData = csvData;
-        transformation.table = table;
-        return transformation;
-    }
-
-    @Override
-    public void validateParameters(MonitorableJob.Status status) {
-        if (csvData == null) {
-            status.fail("CSV data must not be null (delete table not yet supported)");
-        }
-    }
-
-    @Override
-    public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status status) {
-        // if (csvData == null) {
-        //     TODO: If this is a null value, delete the table (not yet supported).
-        // }
-
-        String tableName = table + ".txt";
-        // Run the replace transformation
-        Path targetZipPath = Paths.get(zipTarget.gtfsFile.getAbsolutePath());
-        try( FileSystem targetZipFs = FileSystems.newFileSystem(targetZipPath, null) ){
-            // Convert csv data to input stream.
-            InputStream inputStream = new ByteArrayInputStream(csvData.getBytes(StandardCharsets.UTF_8));
-            Path targetTxtFilePath = getTablePathInZip(tableName, targetZipFs);
-            // Set transform type according to whether target file exists.
-            TransformType type = Files.exists(targetTxtFilePath)
-                ? TransformType.TABLE_REPLACED
-                : TransformType.TABLE_ADDED;
-            // Copy csv input stream into the zip file, replacing it if it already exists.
-            Files.copy(inputStream, targetTxtFilePath, StandardCopyOption.REPLACE_EXISTING);
-            zipTarget.feedTransformResult.tableTransformResults.add(new TableTransformResult(tableName, type));
-        } catch (Exception e) {
-            status.fail("Unknown error encountered while transforming zip file", e);
-        }
-    }
+public class ReplaceFileFromStringTransformation extends StringTransformation {
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/ReplaceFileFromVersionTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/ReplaceFileFromVersionTransformation.java
index e78d21f72..53963fb16 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/transform/ReplaceFileFromVersionTransformation.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/ReplaceFileFromVersionTransformation.java
@@ -45,12 +45,12 @@ public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status st
         String tableName = table + ".txt";
         // Run the replace transformation
         Path sourceZipPath = Paths.get(sourceVersion.retrieveGtfsFile().getAbsolutePath());
-        try (FileSystem sourceZipFs = FileSystems.newFileSystem(sourceZipPath, null)) {
+        try (FileSystem sourceZipFs = FileSystems.newFileSystem(sourceZipPath, (ClassLoader) null)) {
             // If the source txt file does not exist, NoSuchFileException will be thrown and caught below.
             Path sourceTxtFilePath = getTablePathInZip(tableName, sourceZipFs);
             Path targetZipPath = Paths.get(zipTarget.gtfsFile.getAbsolutePath());
             LOG.info("Replacing file {} in zip file {} with source {}", tableName, targetZipPath.getFileName(), sourceVersion.id);
-            try (FileSystem targetZipFs = FileSystems.newFileSystem(targetZipPath, null)) {
+            try (FileSystem targetZipFs = FileSystems.newFileSystem(targetZipPath, (ClassLoader) null)) {
                 Path targetTxtFilePath = getTablePathInZip(tableName, targetZipFs);
                 // Set transform type according to whether target file exists.
                 TransformType type = Files.exists(targetTxtFilePath)
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/StringTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/StringTransformation.java
new file mode 100644
index 000000000..c845d4f37
--- /dev/null
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/StringTransformation.java
@@ -0,0 +1,63 @@
+package com.conveyal.datatools.manager.models.transform;
+
+import com.conveyal.datatools.common.status.MonitorableJob;
+import com.conveyal.datatools.manager.models.TableTransformResult;
+import com.conveyal.datatools.manager.models.TransformType;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
+public class StringTransformation extends ZipTransformation {
+
+    public static StringTransformation create(String csvData, String table) {
+        StringTransformation transformation = new StringTransformation();
+        transformation.csvData = csvData;
+        transformation.table = table;
+        return transformation;
+    }
+
+    @Override
+    public void validateParameters(MonitorableJob.Status status) {
+        if (csvData == null) {
+            status.fail("CSV data must not be null");
+        }
+    }
+
+    @Override
+    public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status status) {
+        String tableName = table + ".txt";
+        Path targetZipPath = Paths.get(zipTarget.gtfsFile.getAbsolutePath());
+        try (
+            FileSystem targetZipFs = FileSystems.newFileSystem(targetZipPath, (ClassLoader) null);
+            InputStream inputStream = new ByteArrayInputStream(csvData.getBytes(StandardCharsets.UTF_8));
+        ) {
+            Path targetTxtFilePath = getTablePathInZip(tableName, targetZipFs);
+            TransformType type = Files.exists(targetTxtFilePath)
+                ? TransformType.TABLE_REPLACED
+                : TransformType.TABLE_ADDED;
+            // Copy csv input stream into the zip file, replacing it if it already exists.
+            Files.copy(inputStream, targetTxtFilePath, StandardCopyOption.REPLACE_EXISTING);
+            final int NEW_LINE_CHARACTER_CODE = 10;
+            int lineCount = (int) csvData.chars().filter(c -> c == NEW_LINE_CHARACTER_CODE).count();
+            int addedCount = type == TransformType.TABLE_ADDED ? lineCount : 0;
+            int updatedCount = type == TransformType.TABLE_MODIFIED ? lineCount : 0;
+            zipTarget.feedTransformResult.tableTransformResults.add(new TableTransformResult(
+                tableName,
+                type,
+                0,
+                updatedCount,
+                addedCount,
+                0
+            ));
+        } catch (Exception e) {
+            status.fail("Unknown error encountered while transforming zip file", e);
+        }
+    }
+}
diff --git a/src/main/java/com/conveyal/datatools/manager/persistence/Persistence.java b/src/main/java/com/conveyal/datatools/manager/persistence/Persistence.java
index 91f03bf85..e215c6742 100644
--- a/src/main/java/com/conveyal/datatools/manager/persistence/Persistence.java
+++ b/src/main/java/com/conveyal/datatools/manager/persistence/Persistence.java
@@ -18,15 +18,20 @@
 import com.conveyal.datatools.manager.models.Snapshot;
 import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientSettings;
+import com.mongodb.client.AggregateIterable;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
+import org.bson.Document;
 import org.bson.codecs.configuration.CodecRegistries;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.codecs.pojo.PojoCodecProvider;
+import org.bson.conversions.Bson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 import static com.conveyal.datatools.manager.DataManager.getConfigPropertyAsText;
 
 /**
@@ -128,5 +133,19 @@ public static void initialize () {
 //        feedVersions.getMongoCollection().createIndex(Indexes.descending("feedSourceId", "version"));
 //        snapshots.getMongoCollection().createIndex(Indexes.descending("feedSourceId", "version"));
     }
-    
+
+    /**
+     * Provide a direct link to the Mongo database which is not tied to a specific entity type.
+     */
+    public static MongoDatabase getMongoDatabase() {
+        return mongoDatabase;
+    }
+
+    /**
+     * Get all bespoke documents matching query. These documents are tailored to the query response and are not tied
+     * directly to a persistence type.
+     */
+    public static AggregateIterable<Document> getDocuments(String collection, List<Bson> stages) {
+        return getMongoDatabase().getCollection(collection).aggregate(stages);
+    }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/persistence/TypedPersistence.java b/src/main/java/com/conveyal/datatools/manager/persistence/TypedPersistence.java
index 28288394f..5fe847228 100644
--- a/src/main/java/com/conveyal/datatools/manager/persistence/TypedPersistence.java
+++ b/src/main/java/com/conveyal/datatools/manager/persistence/TypedPersistence.java
@@ -20,6 +20,8 @@
 
 import static com.mongodb.client.model.Filters.eq;
 import static com.mongodb.client.model.Filters.in;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
 import static com.mongodb.client.model.Updates.pull;
 
 /**
@@ -146,6 +148,16 @@ public T getById (String id) {
         return mongoCollection.find(eq(id)).first();
     }
 
+    /**
+     * Get first matching object populating only the included fields.
+     */
+    public T getByIdLimitedFields (String id, String... includedFields) {
+        return mongoCollection
+            .find(eq(id))
+            .projection(fields(include(includedFields)))
+            .first();
+    }
+
     /**
      * This is not memory efficient.
      * TODO: Always use iterators / streams, always perform selection of subsets on the Mongo server side ("where clause").
@@ -169,7 +181,27 @@ public List<T> getByIds (List<String> ids) {
      * We should really have a bit more abstraction here.
      */
     public List<T> getFiltered (Bson filter) {
-        return mongoCollection.find(filter).into(new ArrayList<>());
+        return getFiltered(filter, null);
+    }
+
+    /**
+     * Get all objects satisfying the supplied Mongo filter and sort by.
+     */
+    public List<T> getFiltered (Bson filter, Bson sortBy) {
+        return (sortBy != null)
+        ? mongoCollection.find(filter).sort(sortBy).into(new ArrayList<>())
+        : mongoCollection.find(filter).into(new ArrayList<>());
+    }
+
+    /**
+     * Get all objects populating only the included fields satisfying the supplied Mongo filter and sort by.
+     */
+    public List<T> getFilteredLimitedFields(Bson filter, Bson sortBy, String... includedFields) {
+        return mongoCollection
+            .find(filter)
+            .projection(fields(include(includedFields)))
+            .sort(sortBy)
+            .into(new ArrayList<>());
     }
 
     /**
diff --git a/src/main/java/com/conveyal/datatools/manager/utils/HttpUtils.java b/src/main/java/com/conveyal/datatools/manager/utils/HttpUtils.java
index fdd6ed0d5..2f3461a9a 100644
--- a/src/main/java/com/conveyal/datatools/manager/utils/HttpUtils.java
+++ b/src/main/java/com/conveyal/datatools/manager/utils/HttpUtils.java
@@ -14,9 +14,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -113,4 +116,21 @@ public static SimpleHttpResponse httpRequestRawResponse(
             return null;
         }
     }
+
+    /**
+     * Download a file from a URL and return as a byte array.
+     */
+    public static byte[] downloadFileFromURL(URL url) throws IOException {
+        try (
+            InputStream inputStream = url.openStream();
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream()
+        ) {
+            byte[] chunk = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(chunk)) >= 0) {
+                outputStream.write(chunk, 0, bytesRead);
+            }
+            return outputStream.toByteArray();
+        }
+    }
 }
diff --git a/src/main/java/com/conveyal/datatools/manager/utils/json/JsonUtil.java b/src/main/java/com/conveyal/datatools/manager/utils/json/JsonUtil.java
index 0181ad5a3..0fd826d50 100644
--- a/src/main/java/com/conveyal/datatools/manager/utils/json/JsonUtil.java
+++ b/src/main/java/com/conveyal/datatools/manager/utils/json/JsonUtil.java
@@ -7,8 +7,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.type.CollectionType;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
 import spark.Request;
 
 import java.io.IOException;
diff --git a/src/test/java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java b/src/test/java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java
index 34ac94f39..72e536dd4 100644
--- a/src/test/java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java
+++ b/src/test/java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java
@@ -1,6 +1,7 @@
 package com.conveyal.datatools;
 
 import com.conveyal.datatools.common.status.MonitorableJob;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.jobs.LoadFeedJob;
 import com.conveyal.datatools.manager.jobs.ProcessSingleFeedJob;
 import com.conveyal.datatools.manager.jobs.ValidateFeedJob;
@@ -30,10 +31,12 @@ public class HandleCorruptGTFSFileTest {
     public static void setUp() throws IOException {
         // start server if it isn't already running
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
     }
 
     @AfterAll
     public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         mockProject.delete();
     }
 
@@ -56,7 +59,7 @@ public void canHandleCorruptGTFSFile() {
             assertTrue(subJob.status.error);
             if (subJob instanceof LoadFeedJob) {
                 assertEquals(
-                    "Could not load feed due to java.util.zip.ZipException: error in opening zip file",
+                    "Could not load feed due to java.util.zip.ZipException: zip END header not found",
                     subJob.status.message
                 );
             }
diff --git a/src/test/java/com/conveyal/datatools/editor/controllers/api/EditorControllerTest.java b/src/test/java/com/conveyal/datatools/editor/controllers/api/EditorControllerTest.java
index 8e5cacc19..45a658b3f 100644
--- a/src/test/java/com/conveyal/datatools/editor/controllers/api/EditorControllerTest.java
+++ b/src/test/java/com/conveyal/datatools/editor/controllers/api/EditorControllerTest.java
@@ -25,22 +25,28 @@
 import spark.utils.IOUtils;
 
 import java.io.IOException;
+import java.sql.SQLException;
 import java.util.Date;
 import java.util.stream.Stream;
 
+import static com.conveyal.datatools.TestUtils.assertThatSqlCountQueryYieldsExpectedCount;
 import static com.conveyal.datatools.TestUtils.createFeedVersionFromGtfsZip;
 import static com.conveyal.datatools.manager.auth.Auth0Users.USERS_API_PATH;
 import static com.conveyal.datatools.manager.controllers.api.UserController.TEST_AUTH0_DOMAIN;
 import static io.restassured.RestAssured.given;
+import static org.eclipse.jetty.http.HttpStatus.OK_200;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EditorControllerTest extends UnitTest {
     private static final Logger LOG = LoggerFactory.getLogger(EditorControllerTest.class);
     private static Project project;
     private static FeedSource feedSource;
+    private static FeedSource feedSourceCascadeDelete;
     private static FeedVersion feedVersion;
+    private static FeedVersion feedVersionCascadeDelete;
     private static final ObjectMapper mapper = new ObjectMapper();
 
     /**
@@ -55,18 +61,23 @@ public static void setUp() throws Exception {
         UserController.setBaseUsersUrl("http://" + TEST_AUTH0_DOMAIN + USERS_API_PATH);
         // Create a project, feed sources, and feed versions to merge.
         project = new Project();
-        project.name = String.format("Test %s", new Date().toString());
+        project.name = String.format("Test %s", new Date());
         Persistence.projects.create(project);
+
         feedSource = new FeedSource("BART");
         feedSource.projectId = project.id;
         Persistence.feedSources.create(feedSource);
+
+        feedSourceCascadeDelete = new FeedSource("CASCADE_DELETE");
+        feedSourceCascadeDelete.projectId = project.id;
+        Persistence.feedSources.create(feedSourceCascadeDelete);
+
         feedVersion = createFeedVersionFromGtfsZip(feedSource, "bart_old.zip");
-        // Create and run snapshot job
-        Snapshot snapshot = new Snapshot("Snapshot of " + feedVersion.name, feedSource.id, feedVersion.namespace);
-        CreateSnapshotJob createSnapshotJob =
-            new CreateSnapshotJob(Auth0UserProfile.createTestAdminUser(), snapshot, true, false, false);
-        // Run in current thread so tests do not run until this is complete.
-        createSnapshotJob.run();
+        feedVersionCascadeDelete = createFeedVersionFromGtfsZip(feedSourceCascadeDelete, "bart_old.zip");
+
+        // Create and run snapshot jobs
+        crateAndRunSnapshotJob(feedVersion.name, feedSource.id, feedVersion.namespace);
+        crateAndRunSnapshotJob(feedVersionCascadeDelete.name, feedSourceCascadeDelete.id, feedVersionCascadeDelete.namespace);
         LOG.info("{} setup completed in {} ms", EditorControllerTest.class.getSimpleName(), System.currentTimeMillis() - startTime);
     }
 
@@ -74,6 +85,17 @@ public static void setUp() throws Exception {
     public static void tearDown() {
         project.delete();
         feedSource.delete();
+        feedSourceCascadeDelete.delete();
+    }
+
+    /**
+     * Create and run a snapshot job in the current thread (so tests do not run until this is complete).
+     */
+    private static void crateAndRunSnapshotJob(String feedVersionName, String feedSourceId, String namespace) {
+        Snapshot snapshot = new Snapshot("Snapshot of " + feedVersionName, feedSourceId, namespace);
+        CreateSnapshotJob createSnapshotJob =
+            new CreateSnapshotJob(Auth0UserProfile.createTestAdminUser(), snapshot, true, false, false);
+        createSnapshotJob.run();
     }
 
     private static Stream<Arguments> createPatchTableTests() {
@@ -143,6 +165,44 @@ public void canPatchStopsConditionally() throws IOException {
         }
     }
 
+    /**
+     * Test the removal of a stop and all references in stop times and pattern stops.
+     */
+    @Test
+    void canCascadeDeleteStop() throws IOException, SQLException {
+        // Get a fresh feed source so that the editor namespace was updated after snapshot.
+        FeedSource freshFeedSource = Persistence.feedSources.getById(feedVersionCascadeDelete.feedSourceId);
+        String stopId = "WARM";
+        String stopCountSql = getCountSql(freshFeedSource.editorNamespace, "stops", stopId);
+        String stopTimesCountSql = getCountSql(freshFeedSource.editorNamespace, "stop_times", stopId);
+        String patternStopsCountSql = getCountSql(freshFeedSource.editorNamespace, "pattern_stops", stopId);
+
+        // Check for presence of stopId in stops, stop times and pattern stops.
+        assertThatSqlCountQueryYieldsExpectedCount(stopCountSql, 1);
+        assertThatSqlCountQueryYieldsExpectedCount(stopTimesCountSql, 522);
+        assertThatSqlCountQueryYieldsExpectedCount(patternStopsCountSql, 4);
+
+        String path = String.format(
+            "/api/editor/secure/stop/%s/cascadeDeleteStop?feedId=%s&sessionId=test",
+            stopId,
+            feedVersionCascadeDelete.feedSourceId
+        );
+        String response = given()
+            .port(DataManager.PORT)
+            .delete(path)
+            .then()
+            .extract()
+            .response()
+            .asString();
+        JsonNode json = mapper.readTree(response);
+        assertEquals(OK_200, json.get("code").asInt());
+
+        // Check for removal of stopId in stops, stop times and pattern stops.
+        assertThatSqlCountQueryYieldsExpectedCount(stopCountSql, 0);
+        assertThatSqlCountQueryYieldsExpectedCount(stopTimesCountSql, 0);
+        assertThatSqlCountQueryYieldsExpectedCount(patternStopsCountSql, 0);
+    }
+
     /**
      * Perform patch table request on the feed source ID with the requested query and patch JSON. A null query will
      * apply the patch JSON to the entire table.
@@ -182,4 +242,16 @@ private static JsonNode graphqlQuery (String namespace, String graphQLQueryFile)
             .asString();
         return mapper.readTree(graphQLString);
     }
+
+    /**
+     * Build a sql statement to provide a count on the number of rows matching the stop id.
+     */
+    private static String getCountSql(String namespace, String tableName, String stopId) {
+        return String.format(
+            "SELECT count(*) FROM %s.%s WHERE stop_id = '%s'",
+            namespace,
+            tableName,
+            stopId
+        );
+    }
 }
diff --git a/src/test/java/com/conveyal/datatools/manager/controllers/api/DeploymentControllerTest.java b/src/test/java/com/conveyal/datatools/manager/controllers/api/DeploymentControllerTest.java
new file mode 100644
index 000000000..671afd127
--- /dev/null
+++ b/src/test/java/com/conveyal/datatools/manager/controllers/api/DeploymentControllerTest.java
@@ -0,0 +1,110 @@
+package com.conveyal.datatools.manager.controllers.api;
+
+import com.conveyal.datatools.DatatoolsTest;
+import com.conveyal.datatools.TestUtils;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
+import com.conveyal.datatools.manager.jobs.DeployJob;
+import com.conveyal.datatools.manager.models.Deployment;
+import com.conveyal.datatools.manager.models.DeploymentSummary;
+import com.conveyal.datatools.manager.models.OtpServer;
+import com.conveyal.datatools.manager.models.Project;
+import com.conveyal.datatools.manager.persistence.Persistence;
+import com.conveyal.datatools.manager.utils.HttpUtils;
+import com.conveyal.datatools.manager.utils.SimpleHttpResponse;
+import com.conveyal.datatools.manager.utils.json.JsonUtil;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DeploymentControllerTest extends DatatoolsTest {
+    private static Project project;
+    private static OtpServer server;
+    private static Deployment deployment;
+    private static DeployJob.DeploySummary deploySummary;
+
+    /**
+     * Add project, server, deploy summary and deployment to prepare for test.
+     */
+    @BeforeAll
+    public static void setUp() throws IOException {
+        // start server if it isn't already running
+        DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
+        project = new Project();
+        project.name = String.format("Test %s", new Date());
+        Persistence.projects.create(project);
+
+        server = new OtpServer();
+        server.name = "Test Server";
+        server.projectId = project.id;
+        server.s3Bucket = "datatools-dev";
+        Persistence.servers.create(server);
+
+        deploySummary = new DeployJob.DeploySummary();
+        deploySummary.serverId = server.id;
+
+        deployment = new Deployment();
+        deployment.feedVersionIds = Collections.singletonList("feedVersionId");
+        deployment.projectId = project.id;
+        deployment.name = "Test deployment";
+        deployment.deployJobSummaries.add(deploySummary);
+        deployment.deployedTo = server.id;
+        deployment.routerId = "Test router id";
+        Persistence.deployments.create(deployment);
+
+        // Update project with pinned deployment.
+        project.pinnedDeploymentId = deployment.id;
+        Persistence.projects.replace(project.id, project);
+    }
+
+    /**
+     * Remove objects from the database after test and reset auth.
+     */
+    @AfterAll
+    public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
+        if (project != null) {
+            Persistence.projects.removeById(project.id);
+        }
+        if (server != null) {
+            Persistence.servers.removeById(server.id);
+        }
+        if (deployment != null) {
+            Persistence.deployments.removeById(deployment.id);
+        }
+    }
+
+    /**
+     * Retrieve a deployment summary for the previously created project, and it's related objects.
+     */
+    @Test
+    void canRetrieveDeploymentSummaries() throws IOException {
+        SimpleHttpResponse response = TestUtils.makeRequest(
+            String.format("/api/manager/secure/deploymentSummaries?projectId=%s", project.id),
+            null,
+            HttpUtils.REQUEST_METHOD.GET
+        );
+        List<DeploymentSummary> deploymentSummaries =
+            JsonUtil.getPOJOFromJSONAsList(
+                JsonUtil.getJsonNodeFromResponse(response),
+                DeploymentSummary.class
+            );
+        assertEquals(deployment.id, deploymentSummaries.get(0).id);
+        assertEquals(deployment.name, deploymentSummaries.get(0).name);
+        assertEquals(deployment.dateCreated, deploymentSummaries.get(0).dateCreated);
+        assertEquals(new Date(deploySummary.finishTime), deploymentSummaries.get(0).lastDeployed);
+        assertEquals(server.id, deploymentSummaries.get(0).deployedTo);
+        assertEquals(deployment.feedVersionIds.size(), deploymentSummaries.get(0).numberOfFeedVersions);
+        assertTrue(deploymentSummaries.get(0).test);
+        assertTrue(deploymentSummaries.get(0).isPinned);
+        assertEquals(server.name, deploymentSummaries.get(0).serverName);
+    }
+}
diff --git a/src/test/java/com/conveyal/datatools/manager/controllers/api/FeedSourceControllerTest.java b/src/test/java/com/conveyal/datatools/manager/controllers/api/FeedSourceControllerTest.java
index bb12a29da..1350fbe52 100644
--- a/src/test/java/com/conveyal/datatools/manager/controllers/api/FeedSourceControllerTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/controllers/api/FeedSourceControllerTest.java
@@ -4,30 +4,41 @@
 import com.conveyal.datatools.TestUtils;
 import com.conveyal.datatools.common.utils.Scheduler;
 import com.conveyal.datatools.manager.auth.Auth0Connection;
+import com.conveyal.datatools.manager.models.Deployment;
 import com.conveyal.datatools.manager.models.FeedRetrievalMethod;
 import com.conveyal.datatools.manager.models.FeedSource;
+import com.conveyal.datatools.manager.models.FeedSourceSummary;
+import com.conveyal.datatools.manager.models.FeedVersion;
 import com.conveyal.datatools.manager.models.FetchFrequency;
 import com.conveyal.datatools.manager.models.Label;
+import com.conveyal.datatools.manager.models.Note;
 import com.conveyal.datatools.manager.models.Project;
 import com.conveyal.datatools.manager.persistence.Persistence;
 import com.conveyal.datatools.manager.utils.HttpUtils;
 import com.conveyal.datatools.manager.utils.SimpleHttpResponse;
 import com.conveyal.datatools.manager.utils.json.JsonUtil;
+import com.conveyal.gtfs.validator.ValidationResult;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.LocalDate;
+import java.time.Month;
+import java.time.ZoneId;
+import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import static com.mongodb.client.model.Filters.eq;
 import static org.eclipse.jetty.http.HttpStatus.BAD_REQUEST_400;
 import static org.eclipse.jetty.http.HttpStatus.OK_200;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-
 public class FeedSourceControllerTest extends DatatoolsTest {
     private static Project project = null;
     private static Project projectToBeDeleted = null;
@@ -37,6 +48,20 @@ public class FeedSourceControllerTest extends DatatoolsTest {
     private static FeedSource feedSourceWithInvalidLabels = null;
     private static Label publicLabel = null;
     private static Label adminOnlyLabel = null;
+    private static Label feedSourceWithLatestDeploymentAdminOnlyLabel = null;
+    private static Label feedSourceWithPinnedDeploymentAdminOnlyLabel = null;
+    private static Note feedSourceWithLatestDeploymentAdminOnlyNote = null;
+    private static Note feedSourceWithPinnedDeploymentAdminOnlyNote = null;
+    private static Project projectWithLatestDeployment = null;
+    private static FeedSource feedSourceWithLatestDeploymentFeedVersion = null;
+    private static FeedVersion feedVersionFromLatestDeployment = null;
+    private static Deployment deploymentLatest = null;
+    private static Deployment deploymentSuperseded = null;
+
+    private static Project projectWithPinnedDeployment = null;
+    private static FeedSource feedSourceWithPinnedDeploymentFeedVersion = null;
+    private static FeedVersion feedVersionFromPinnedDeployment = null;
+    private static Deployment deploymentPinned = null;
 
     @BeforeAll
     public static void setUp() throws IOException {
@@ -52,14 +77,100 @@ public static void setUp() throws IOException {
         projectToBeDeleted.autoFetchFeeds = false;
         Persistence.projects.create(projectToBeDeleted);
 
+
         feedSourceWithUrl = createFeedSource("FeedSourceOne", new URL("http://www.feedsource.com"), project);
         feedSourceWithNoUrl = createFeedSource("FeedSourceTwo", null, project);
-        feedSourceWithLabels = createFeedSource("FeedSourceThree", null, projectToBeDeleted);
-        feedSourceWithInvalidLabels = createFeedSource("FeedSourceFour", null, project);
+        feedSourceWithLabels = createFeedSource("FeedSourceThree", new URL("http://www.feedsource.com"), projectToBeDeleted);
+        feedSourceWithInvalidLabels = createFeedSource("FeedSourceFour", new URL("http://www.feedsource.com"), project);
 
-        adminOnlyLabel = createLabel("Admin Only Label");
+        adminOnlyLabel = createLabel("Admin Only Label", projectToBeDeleted.id);
         adminOnlyLabel.adminOnly = true;
-        publicLabel = createLabel("Public Label");
+        publicLabel = createLabel("Public Label", projectToBeDeleted.id);
+
+        setUpFeedVersionFromLatestDeployment();
+        setUpFeedVersionFromPinnedDeployment();
+
+    }
+
+    /**
+     * Create all the required objects to test a feed version from the latest deployment.
+     */
+    private static void setUpFeedVersionFromLatestDeployment() throws MalformedURLException {
+        projectWithLatestDeployment = new Project();
+        projectWithLatestDeployment.id = "project-with-latest-deployment";
+        projectWithLatestDeployment.organizationId = "project-with-latest-deployment-org-id";
+        Persistence.projects.create(projectWithLatestDeployment);
+
+        feedSourceWithLatestDeploymentAdminOnlyLabel = createLabel("label-id-latest-deployment", "Admin Only Label", projectWithLatestDeployment.id);
+        feedSourceWithLatestDeploymentAdminOnlyNote = createNote("note-id-latest-deployment", "A test note");
+
+        feedSourceWithLatestDeploymentFeedVersion = createFeedSource(
+            "feed-source-with-latest-deployment-feed-version",
+            "FeedSource",
+            new URL("http://www.feedsource.com"),
+            projectWithLatestDeployment,
+            true,
+            List.of(feedSourceWithLatestDeploymentAdminOnlyLabel.id),
+            List.of(feedSourceWithLatestDeploymentAdminOnlyNote.id)
+        );
+
+        LocalDate deployedSuperseded = LocalDate.of(2020, Month.MARCH, 12);
+        LocalDate deployedEndDate = LocalDate.of(2021, Month.MARCH, 12);
+        LocalDate deployedStartDate = LocalDate.of(2021, Month.MARCH, 1);
+        feedVersionFromLatestDeployment = createFeedVersion(
+            "feed-version-from-latest-deployment",
+            feedSourceWithLatestDeploymentFeedVersion.id,
+            deployedStartDate,
+            deployedEndDate
+        );
+        deploymentSuperseded = createDeployment(
+            "deployment-superseded",
+            projectWithLatestDeployment,
+            feedVersionFromLatestDeployment.id,
+            deployedSuperseded
+        );
+        deploymentLatest = createDeployment(
+            "deployment-latest",
+            projectWithLatestDeployment,
+            feedVersionFromLatestDeployment.id,
+            deployedEndDate
+        );
+    }
+
+    /**
+     * Create all the required objects to test a feed version from a pinned deployment.
+     */
+    private static void setUpFeedVersionFromPinnedDeployment() throws MalformedURLException {
+        projectWithPinnedDeployment = new Project();
+        projectWithPinnedDeployment.id = "project-with-pinned-deployment";
+        projectWithPinnedDeployment.organizationId = "project-with-pinned-deployment-org-id";
+        Persistence.projects.create(projectWithPinnedDeployment);
+
+        feedSourceWithPinnedDeploymentAdminOnlyLabel = createLabel("label-id-pinned-deployment", "Admin Only Label", projectWithPinnedDeployment.id);
+        feedSourceWithPinnedDeploymentAdminOnlyNote = createNote("note-id-pinned-deployment", "A test note");
+
+        feedSourceWithPinnedDeploymentFeedVersion = createFeedSource(
+            "feed-source-with-pinned-deployment-feed-version",
+            "FeedSourceWithPinnedFeedVersion",
+            new URL("http://www.feedsource.com"),
+            projectWithPinnedDeployment,
+            true,
+            List.of(feedSourceWithPinnedDeploymentAdminOnlyLabel.id),
+            List.of(feedSourceWithPinnedDeploymentAdminOnlyNote.id)
+        );
+        feedVersionFromPinnedDeployment = createFeedVersion(
+            "feed-version-from-pinned-deployment",
+            feedSourceWithPinnedDeploymentFeedVersion.id,
+            LocalDate.of(2022, Month.NOVEMBER, 2)
+        );
+        deploymentPinned = createDeployment(
+            "deployment-pinned",
+            projectWithPinnedDeployment,
+            feedVersionFromPinnedDeployment.id,
+            LocalDate.of(2021, Month.MARCH, 12)
+        );
+        projectWithPinnedDeployment.pinnedDeploymentId = deploymentPinned.id;
+        Persistence.projects.replace(projectWithPinnedDeployment.id, projectWithPinnedDeployment);
     }
 
     @AfterAll
@@ -83,6 +194,54 @@ public static void tearDown() {
         if (adminOnlyLabel != null) {
             Persistence.labels.removeById(adminOnlyLabel.id);
         }
+        tearDownDeployedFeedVersion();
+    }
+
+    /**
+     * These entities are removed separately so that if the need arises they can be kept.
+     * This would then allow the Mongo queries defined in FeedSource#getFeedVersionFromLatestDeployment and
+     * FeedSource#getFeedVersionFromPinnedDeployment to be tested.
+     */
+    private static void tearDownDeployedFeedVersion() {
+        if (projectWithPinnedDeployment != null) {
+            Persistence.projects.removeById(projectWithPinnedDeployment.id);
+        }
+        if (projectWithLatestDeployment != null) {
+            Persistence.projects.removeById(projectWithLatestDeployment.id);
+        }
+        if (feedSourceWithLatestDeploymentFeedVersion != null) {
+            Persistence.feedSources.removeById(feedSourceWithLatestDeploymentFeedVersion.id);
+        }
+        if (feedSourceWithPinnedDeploymentFeedVersion != null) {
+            Persistence.feedSources.removeById(feedSourceWithPinnedDeploymentFeedVersion.id);
+        }
+        if (feedVersionFromLatestDeployment != null) {
+            Persistence.feedVersions.removeById(feedVersionFromLatestDeployment.id);
+        }
+        if (feedVersionFromPinnedDeployment != null) {
+            Persistence.feedVersions.removeById(feedVersionFromPinnedDeployment.id);
+        }
+        if (deploymentPinned != null) {
+            Persistence.deployments.removeById(deploymentPinned.id);
+        }
+        if (deploymentLatest != null) {
+            Persistence.deployments.removeById(deploymentLatest.id);
+        }
+        if (deploymentSuperseded != null) {
+            Persistence.deployments.removeById(deploymentSuperseded.id);
+        }
+        if (feedSourceWithPinnedDeploymentAdminOnlyLabel != null) {
+            Persistence.labels.removeById(feedSourceWithPinnedDeploymentAdminOnlyLabel.id);
+        }
+        if (feedSourceWithLatestDeploymentAdminOnlyLabel != null) {
+            Persistence.labels.removeById(feedSourceWithLatestDeploymentAdminOnlyLabel.id);
+        }
+        if (feedSourceWithPinnedDeploymentAdminOnlyNote != null) {
+            Persistence.notes.removeById(feedSourceWithPinnedDeploymentAdminOnlyNote.id);
+        }
+        if (feedSourceWithLatestDeploymentAdminOnlyNote != null) {
+            Persistence.notes.removeById(feedSourceWithLatestDeploymentAdminOnlyNote.id);
+        }
     }
 
     /**
@@ -141,7 +300,7 @@ public void createFeedSourceWithNoUrlTest() {
      * Create some labels, add them to the feed source make them admin only, and check that they don't appear if not an admin
      */
     @Test
-    public void createFeedSourceWithLabels() throws IOException {
+    public void createFeedSourceWithLabels() {
         // Create labels
         SimpleHttpResponse createFirstLabelResponse = TestUtils.makeRequest("/api/manager/secure/label",
                 JsonUtil.toJson(publicLabel),
@@ -205,11 +364,96 @@ public void createFeedSourceWithLabels() throws IOException {
         assertEquals(0, Persistence.labels.getFiltered(eq("projectId", projectToBeDeleted.id)).size());
     }
 
+    @Test
+    void canRetrieveDeployedFeedVersionFromLatestDeployment() throws IOException {
+        SimpleHttpResponse response = TestUtils.makeRequest(
+            String.format(
+                "/api/manager/secure/feedsourceSummaries?projectId=%s",
+                feedSourceWithLatestDeploymentFeedVersion.projectId
+            ),
+            null,
+            HttpUtils.REQUEST_METHOD.GET
+        );
+        assertEquals(OK_200, response.status);
+
+        List<FeedSourceSummary> feedSourceSummaries =
+            JsonUtil.getPOJOFromJSONAsList(
+                JsonUtil.getJsonNodeFromResponse(response),
+                FeedSourceSummary.class
+            );
+
+        assertNotNull(feedSourceSummaries);
+        assertEquals(feedSourceWithLatestDeploymentFeedVersion.id, feedSourceSummaries.get(0).id);
+        assertEquals(feedSourceWithLatestDeploymentFeedVersion.projectId, feedSourceSummaries.get(0).projectId);
+        assertEquals(feedSourceWithLatestDeploymentFeedVersion.labelIds, feedSourceSummaries.get(0).labelIds);
+        assertEquals(feedSourceWithLatestDeploymentFeedVersion.url.toString(), feedSourceSummaries.get(0).url);
+        assertEquals(feedSourceWithLatestDeploymentFeedVersion.noteIds, feedSourceSummaries.get(0).noteIds);
+        assertEquals(feedSourceWithLatestDeploymentFeedVersion.organizationId(), feedSourceSummaries.get(0).organizationId);
+        assertEquals(feedVersionFromLatestDeployment.id, feedSourceSummaries.get(0).deployedFeedVersionId);
+        assertEquals(feedVersionFromLatestDeployment.validationSummary().startDate, feedSourceSummaries.get(0).deployedFeedVersionStartDate);
+        assertEquals(feedVersionFromLatestDeployment.validationSummary().endDate, feedSourceSummaries.get(0).deployedFeedVersionEndDate);
+        assertEquals(feedVersionFromLatestDeployment.validationSummary().errorCount, feedSourceSummaries.get(0).deployedFeedVersionIssues);
+        assertEquals(feedVersionFromLatestDeployment.id, feedSourceSummaries.get(0).latestValidation.feedVersionId);
+        assertEquals(feedVersionFromLatestDeployment.validationSummary().startDate, feedSourceSummaries.get(0).latestValidation.startDate);
+        assertEquals(feedVersionFromLatestDeployment.validationSummary().endDate, feedSourceSummaries.get(0).latestValidation.endDate);
+        assertEquals(feedVersionFromLatestDeployment.validationSummary().errorCount, feedSourceSummaries.get(0).latestValidation.errorCount);
+    }
+
+    @Test
+    void canRetrieveDeployedFeedVersionFromPinnedDeployment() throws IOException {
+        SimpleHttpResponse response = TestUtils.makeRequest(
+            String.format(
+                "/api/manager/secure/feedsourceSummaries?projectId=%s",
+                feedSourceWithPinnedDeploymentFeedVersion.projectId
+            ),
+            null,
+            HttpUtils.REQUEST_METHOD.GET
+        );
+        assertEquals(OK_200, response.status);
+
+        List<FeedSourceSummary> feedSourceSummaries =
+            JsonUtil.getPOJOFromJSONAsList(
+                JsonUtil.getJsonNodeFromResponse(response),
+                FeedSourceSummary.class
+            );
+        assertNotNull(feedSourceSummaries);
+        assertEquals(feedSourceWithPinnedDeploymentFeedVersion.id, feedSourceSummaries.get(0).id);
+        assertEquals(feedSourceWithPinnedDeploymentFeedVersion.projectId, feedSourceSummaries.get(0).projectId);
+        assertEquals(feedSourceWithPinnedDeploymentFeedVersion.labelIds, feedSourceSummaries.get(0).labelIds);
+        assertEquals(feedSourceWithPinnedDeploymentFeedVersion.url.toString(), feedSourceSummaries.get(0).url);
+        assertEquals(feedSourceWithPinnedDeploymentFeedVersion.noteIds, feedSourceSummaries.get(0).noteIds);
+        assertEquals(feedSourceWithPinnedDeploymentFeedVersion.organizationId(), feedSourceSummaries.get(0).organizationId);
+        assertEquals(feedVersionFromPinnedDeployment.id, feedSourceSummaries.get(0).deployedFeedVersionId);
+        assertEquals(feedVersionFromPinnedDeployment.validationSummary().startDate, feedSourceSummaries.get(0).deployedFeedVersionStartDate);
+        assertEquals(feedVersionFromPinnedDeployment.validationSummary().endDate, feedSourceSummaries.get(0).deployedFeedVersionEndDate);
+        assertEquals(feedVersionFromPinnedDeployment.validationSummary().errorCount, feedSourceSummaries.get(0).deployedFeedVersionIssues);
+        assertEquals(feedVersionFromPinnedDeployment.id, feedSourceSummaries.get(0).latestValidation.feedVersionId);
+        assertEquals(feedVersionFromPinnedDeployment.validationSummary().startDate, feedSourceSummaries.get(0).latestValidation.startDate);
+        assertEquals(feedVersionFromPinnedDeployment.validationSummary().endDate, feedSourceSummaries.get(0).latestValidation.endDate);
+        assertEquals(feedVersionFromPinnedDeployment.validationSummary().errorCount, feedSourceSummaries.get(0).latestValidation.errorCount);
+    }
+
+    private static FeedSource createFeedSource(String name, URL url, Project project) {
+        return createFeedSource(null, name, url, project, false);
+    }
+
     /**
      * Helper method to create feed source.
      */
-    private static FeedSource createFeedSource(String name, URL url, Project project) {
+    private static FeedSource createFeedSource(String id, String name, URL url, Project project, boolean persist) {
+        return createFeedSource(id, name, url, project, persist, null, null);
+    }
+    private static FeedSource createFeedSource(
+        String id,
+        String name,
+        URL url,
+        Project project,
+        boolean persist,
+        List<String> labels,
+        List<String> notes
+    ) {
         FeedSource feedSource = new FeedSource();
+        if (id != null) feedSource.id = id;
         feedSource.fetchFrequency = FetchFrequency.MINUTES;
         feedSource.fetchInterval = 1;
         feedSource.deployable = false;
@@ -217,14 +461,81 @@ private static FeedSource createFeedSource(String name, URL url, Project project
         feedSource.projectId = project.id;
         feedSource.retrievalMethod = FeedRetrievalMethod.FETCHED_AUTOMATICALLY;
         feedSource.url = url;
+        if (labels != null) feedSource.labelIds = labels;
+        if (notes != null) feedSource.noteIds = notes;
+        if (persist) Persistence.feedSources.create(feedSource);
         return feedSource;
     }
 
     /**
-     * Helper method to create label
+     * Helper method to create a deployment.
+     */
+    private static Deployment createDeployment(
+        String id,
+        Project project,
+        String feedVersionId,
+        LocalDate dateCreated
+    ) {
+        Deployment deployment = new Deployment();
+        deployment.dateCreated = Date.from(dateCreated.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        deployment.feedVersionIds = Collections.singletonList(feedVersionId);
+        deployment.projectId = project.id;
+        deployment.id = id;
+        Persistence.deployments.create(deployment);
+        return deployment;
+    }
+
+    /**
+     * Helper method to create a feed version with no start date.
+     */
+    private static FeedVersion createFeedVersion(String id, String feedSourceId, LocalDate endDate) {
+        return createFeedVersion(id, feedSourceId, null, endDate);
+    }
+
+    /**
+     * Helper method to create a feed version.
+     */
+    private static FeedVersion createFeedVersion(String id, String feedSourceId, LocalDate startDate, LocalDate endDate) {
+        FeedVersion feedVersion = new FeedVersion();
+        feedVersion.id = id;
+        feedVersion.feedSourceId = feedSourceId;
+        ValidationResult validationResult = new ValidationResult();
+        validationResult.firstCalendarDate = startDate;
+        validationResult.lastCalendarDate = endDate;
+        validationResult.errorCount = 5 + (int)(Math.random() * ((1000 - 5) + 1));
+        feedVersion.validationResult = validationResult;
+        Persistence.feedVersions.create(feedVersion);
+        return feedVersion;
+    }
+
+    /**
+     * Helper method to create note.
+     */
+    private static Note createNote(String id, String body) {
+        Note note = new Note(id, body, false);
+        Persistence.notes.create(note);
+        return note;
+    }
+
+    /**
+     * Helper method to create label. If the id is provided save the label now if not defer to test to save.
+     */
+    private static Label createLabel(String id, String name, String projectId) {
+        Label label;
+        if (id != null) {
+            label = new Label(id, name, "A label used during testing", "#123", false, projectId);
+            Persistence.labels.create(label);
+        } else {
+            label = new Label(name, "A label used during testing", "#123", false, projectId);
+        }
+        return label;
+    }
+
+    /**
+     * Helper method to create label.
      */
-    private static Label createLabel(String name) {
-        return new Label(name, "A label used during testing", "#123", false, projectToBeDeleted.id);
+    private static Label createLabel(String name, String projectId) {
+        return createLabel(null, name, projectId);
     }
 
     /**
diff --git a/src/test/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResourceTest.java b/src/test/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResourceTest.java
index 741627985..3a6cb6a31 100644
--- a/src/test/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResourceTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResourceTest.java
@@ -2,6 +2,7 @@
 
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.models.ExternalFeedSourceProperty;
 import com.conveyal.datatools.manager.models.FeedSource;
 import com.conveyal.datatools.manager.models.FeedVersion;
@@ -50,6 +51,7 @@ class MtcFeedResourceTest extends UnitTest {
     static void setUp() throws IOException {
         // start server if it isn't already running
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
         // Create a project, feed sources.
         project = new Project();
         project.name = String.format("Test %s", new Date());
@@ -69,6 +71,7 @@ static void setUp() throws IOException {
 
     @AfterAll
     static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         wireMockServer.stop();
         if (project != null) {
             project.delete();
diff --git a/src/test/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidationTest.java b/src/test/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidationTest.java
index ac24c29bb..2ed4d6381 100644
--- a/src/test/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidationTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidationTest.java
@@ -3,6 +3,7 @@
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
 import com.conveyal.datatools.manager.DataManager;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.jobs.MergeFeedsJobTest;
 import com.conveyal.datatools.manager.models.FeedSource;
 import com.conveyal.datatools.manager.models.FeedVersion;
@@ -44,6 +45,7 @@ public class GtfsPlusValidationTest extends UnitTest {
     public static void setUp() throws IOException {
         // Start server if it isn't already running.
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
         // Create a project, feed sources, and feed versions to merge.
         project = new Project();
         project.name = String.format("Test %s", new Date());
@@ -65,6 +67,7 @@ public static void setUp() throws IOException {
 
     @AfterAll
     static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         project.delete();
     }
 
@@ -72,8 +75,8 @@ static void tearDown() {
     void canValidateCleanGtfsPlus() throws Exception {
         LOG.info("Validation BART GTFS+");
         GtfsPlusValidation validation = GtfsPlusValidation.validate(bartVersion1.id);
-        // Expect issues to be zero.
-        assertThat("Issues count for clean BART feed is zero", validation.issues.size(), equalTo(0));
+        // Expect issues to be only one with directions.txt file
+        assertThat("Clean BART feed and incomplete directions.txt results in one issue", validation.issues.size(), equalTo(1));
     }
 
     @Test
@@ -82,8 +85,8 @@ void canValidateGtfsPlusWithQuotedValues() throws Exception {
         GtfsPlusValidation validation = GtfsPlusValidation.validate(bartVersion1WithQuotedValues.id);
         // Expect issues to be zero.
         assertThat(
-            "Issues count for clean BART feed (quoted values) is zero",
-            validation.issues.size(), equalTo(0)
+            "Issues count for clean BART feed (quoted values) is equal to 1 (as above)",
+            validation.issues.size(), equalTo(1)
         );
     }
 
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/ArbitraryTransformJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/ArbitraryTransformJobTest.java
index e37db9786..40fa2cdba 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/ArbitraryTransformJobTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/ArbitraryTransformJobTest.java
@@ -2,15 +2,19 @@
 
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
-import com.conveyal.datatools.manager.models.FeedRetrievalMethod;
 import com.conveyal.datatools.manager.models.FeedSource;
 import com.conveyal.datatools.manager.models.FeedVersion;
 import com.conveyal.datatools.manager.models.Project;
 import com.conveyal.datatools.manager.models.Snapshot;
+import com.conveyal.datatools.manager.models.TableTransformResult;
+import com.conveyal.datatools.manager.models.transform.AddCustomFileFromStringTransformation;
+import com.conveyal.datatools.manager.models.transform.AppendToFileTransformation;
 import com.conveyal.datatools.manager.models.transform.DeleteRecordsTransformation;
 import com.conveyal.datatools.manager.models.transform.FeedTransformRules;
 import com.conveyal.datatools.manager.models.transform.FeedTransformation;
+import com.conveyal.datatools.manager.models.transform.PreserveCustomFieldsTransformation;
 import com.conveyal.datatools.manager.models.transform.ReplaceFileFromStringTransformation;
 import com.conveyal.datatools.manager.models.transform.ReplaceFileFromVersionTransformation;
 import com.conveyal.datatools.manager.persistence.Persistence;
@@ -36,7 +40,6 @@
 import static com.conveyal.datatools.TestUtils.createFeedVersion;
 import static com.conveyal.datatools.TestUtils.zipFolderFiles;
 import static com.conveyal.datatools.manager.models.FeedRetrievalMethod.MANUALLY_UPLOADED;
-import static com.conveyal.datatools.manager.models.FeedRetrievalMethod.VERSION_CLONE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -56,6 +59,7 @@ public class ArbitraryTransformJobTest extends UnitTest {
     public static void setUp() throws IOException {
         // start server if it isn't already running
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
 
         // Create a project, feed sources, and feed versions to merge.
         project = new Project();
@@ -72,6 +76,7 @@ public static void setUp() throws IOException {
      */
     @AfterAll
     public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         // Project delete cascades to feed sources.
         project.delete();
     }
@@ -101,7 +106,7 @@ public void tearDownTest() {
      * into the target version's GTFS file.
      */
     @Test
-    public void canReplaceGtfsPlusFileFromVersion() throws IOException {
+    void canReplaceGtfsPlusFileFromVersion() throws IOException {
         final String table = "stop_attributes";
         // Create source version (folder contains stop_attributes file).
         sourceVersion = createFeedVersion(
@@ -126,7 +131,7 @@ public void canReplaceGtfsPlusFileFromVersion() throws IOException {
     }
 
     @Test
-    public void canDeleteTrips() throws IOException {
+    void canDeleteTrips() throws IOException {
         // Add delete trips transformation.
         List<String> routeIds = new ArrayList<>();
         // Collect route_id values.
@@ -148,7 +153,7 @@ public void canDeleteTrips() throws IOException {
         );
         // Fetch snapshot where modifications were made and create new version from it.
         Snapshot snapshotWithModifications = feedSource.retrieveSnapshots().iterator().next();
-        CreateFeedVersionFromSnapshotJob newVersionJob = new CreateFeedVersionFromSnapshotJob(feedSource, snapshotWithModifications, user);
+        CreateFeedVersionFromSnapshotJob newVersionJob = new CreateFeedVersionFromSnapshotJob(feedSource, snapshotWithModifications, user, false);
         newVersionJob.run();
         // Grab the modified version and check that the trips count matches expectation.
         FeedVersion newVersion = feedSource.retrieveLatest();
@@ -160,7 +165,7 @@ public void canDeleteTrips() throws IOException {
     }
 
     @Test
-    public void replaceGtfsPlusFileFailsIfSourceIsMissing() throws IOException {
+    void replaceGtfsPlusFileFailsIfSourceIsMissing() throws IOException {
         sourceVersion = createFeedVersion(
             feedSource,
             zipFolderFiles("fake-agency-with-only-calendar")
@@ -181,7 +186,103 @@ public void replaceGtfsPlusFileFailsIfSourceIsMissing() throws IOException {
     }
 
     @Test
-    public void canReplaceFeedInfo() throws SQLException, IOException {
+    void canAppendToStops() throws SQLException, IOException {
+        sourceVersion = createFeedVersion(
+                feedSource,
+                zipFolderFiles("fake-agency-with-only-calendar")
+        );
+        FeedTransformation transformation = AppendToFileTransformation.create(generateStopRow(), "stops");
+        FeedTransformRules transformRules = new FeedTransformRules(transformation);
+        feedSource.transformRules.add(transformRules);
+        Persistence.feedSources.replace(feedSource.id, feedSource);
+        // Create new target version (note: the folder has no stop_attributes.txt file)
+        targetVersion = createFeedVersion(
+                feedSource,
+                zipFolderFiles("fake-agency-with-only-calendar-dates")
+        );
+        LOG.info("Checking assertions.");
+        assertEquals(
+                5 + 3, // Magic number should match row count of stops.txt with three extra
+                targetVersion.feedLoadResult.stops.rowCount,
+                "stops.txt row count should equal input csv data # of rows + 3 extra rows"
+        );
+        // Check for presence of new stop id in database (one record).
+        assertThatSqlCountQueryYieldsExpectedCount(
+                String.format(
+                        "SELECT count(*) FROM %s.stops WHERE stop_id = '%s'",
+                        targetVersion.namespace,
+                        "new"
+                ),
+                1
+        );
+    }
+
+
+    @Test
+    void canAppendToStopsWithLeadingNewlineInData() throws SQLException, IOException {
+        sourceVersion = createFeedVersion(
+                feedSource,
+                zipFolderFiles("fake-agency-with-only-calendar-and-trailing-newlines")
+        );
+        FeedTransformation transformation = AppendToFileTransformation.create(generateStopRowWithLeadingNewline(), "stops");
+        FeedTransformRules transformRules = new FeedTransformRules(transformation);
+        feedSource.transformRules.add(transformRules);
+        Persistence.feedSources.replace(feedSource.id, feedSource);
+        // Create new target version (note: the folder has no stop_attributes.txt file)
+        targetVersion = createFeedVersion(
+                feedSource,
+                zipFolderFiles("fake-agency-with-only-calendar-dates")
+        );
+        LOG.info("Checking assertions.");
+        assertEquals(
+                5 + 3, // Magic number should match row count of stops.txt with three extra
+                targetVersion.feedLoadResult.stops.rowCount,
+                "stops.txt row count should equal input csv data # of rows + 3 extra rows"
+        );
+        // Check for presence of new stop id in database (one record).
+        assertThatSqlCountQueryYieldsExpectedCount(
+                String.format(
+                        "SELECT count(*) FROM %s.stops WHERE stop_id = '%s'",
+                        targetVersion.namespace,
+                        "new"
+                ),
+                1
+        );
+    }
+    @Test
+    void canAppendToStopsWithTrailingNewlineInData() throws SQLException, IOException {
+        sourceVersion = createFeedVersion(
+                feedSource,
+                zipFolderFiles("fake-agency-with-only-calendar-and-trailing-newlines")
+        );
+        FeedTransformation transformation = AppendToFileTransformation.create(generateStopRowWithTrailingNewline(), "stops");
+        FeedTransformRules transformRules = new FeedTransformRules(transformation);
+        feedSource.transformRules.add(transformRules);
+        Persistence.feedSources.replace(feedSource.id, feedSource);
+        // Create new target version (note: the folder has no stop_attributes.txt file)
+        targetVersion = createFeedVersion(
+                feedSource,
+                zipFolderFiles("fake-agency-with-only-calendar-dates")
+        );
+        LOG.info("Checking assertions.");
+        assertEquals(
+                5 + 3, // Magic number should match row count of stops.txt with three extra
+                targetVersion.feedLoadResult.stops.rowCount,
+                "stops.txt row count should equal input csv data # of rows + 3 extra rows"
+        );
+        // Check for presence of new stop id in database (one record).
+        assertThatSqlCountQueryYieldsExpectedCount(
+                String.format(
+                        "SELECT count(*) FROM %s.stops WHERE stop_id = '%s'",
+                        targetVersion.namespace,
+                        "new"
+                ),
+                1
+        );
+    }
+
+    @Test
+    void canReplaceFeedInfo() throws SQLException, IOException {
         // Generate random UUID for feedId, which gets placed into the csv data.
         final String feedId = UUID.randomUUID().toString();
         final String feedInfoContent = generateFeedInfo(feedId);
@@ -215,6 +316,48 @@ public void canReplaceFeedInfo() throws SQLException, IOException {
         );
     }
 
+    @Test
+    void canPreserveCustomFieldsInStops() throws IOException {
+        String stops = generateStopsWithCustomFields();
+        FeedTransformation transformation = PreserveCustomFieldsTransformation.create(stops, "stops");
+        FeedTransformRules transformRules = new FeedTransformRules(transformation);
+        feedSource.transformRules.add(transformRules);
+        Persistence.feedSources.replace(feedSource.id, feedSource);
+        targetVersion = createFeedVersion(
+            feedSource,
+            zipFolderFiles("fake-agency-with-only-calendar-dates")
+        );
+        TableTransformResult transformResult = targetVersion.feedTransformResult.tableTransformResults.get(0);
+        assertEquals(
+                2,
+                transformResult.customColumnsAdded,
+                "stops.txt custom column count should equal input csv data # of custom columns"
+        );
+        assertEquals(
+                2,
+                transformResult.updatedCount,
+                "stops.txt row count modified with custom content should equal input csv data # of custom columns"
+        );
+    }
+
+    @Test
+    void canAddCustomFile() throws IOException {
+        String customCsv = generateCustomCsvData();
+        FeedTransformation transformation = AddCustomFileFromStringTransformation.create(customCsv, "custom-file");
+        FeedTransformRules transformRules = new FeedTransformRules(transformation);
+        feedSource.transformRules.add(transformRules);
+        Persistence.feedSources.replace(feedSource.id, feedSource);
+        targetVersion = createFeedVersion(
+            feedSource,
+            zipFolderFiles("fake-agency-with-only-calendar-dates")
+        );
+        assertEquals(
+                2,
+                targetVersion.feedTransformResult.tableTransformResults.get(0).addedCount,
+                "custom-file.txt custom row count should equal input csv data # of rows"
+        );
+    }
+
     private static String generateFeedInfo(String feedId) {
         // Add feed_info csv data (purposefully with two rows, even though this is not valid GTFS).
         return String.format(
@@ -222,4 +365,31 @@ private static String generateFeedInfo(String feedId) {
             feedId
         );
     }
+    private static String generateStopsWithCustomFields() {
+        return "stop_id,custom_column1,custom_column2"
+            + "\n4u6g,customValue1,customValue2"
+            + "\n1234567,customValue3,customValue4";
+    }
+
+    private static String generateStopRow() {
+        return "new3,new3,appended stop,,37,-122,,,0,123,," +
+                "\nnew2,new2,appended stop,,37,-122,,,0,123,," +
+                "\nnew,new,appended stop,,37.06668,-122.07781,,,0,123,,";
+    }
+    private static String generateStopRowWithLeadingNewline() {
+        return "\nnew3,new3,appended stop,,37,-122,,,0,123,," +
+                "\nnew2,new2,appended stop,,37,-122,,,0,123,," +
+                "\nnew,new,appended stop,,37.06668,-122.07781,,,0,123,,";
+    }
+    private static String generateStopRowWithTrailingNewline() {
+        return "new3,new3,appended stop,,37,-122,,,0,123,," +
+                "\nnew2,new2,appended stop,,37,-122,,,0,123,," +
+                "\nnew,new,appended stop,,37.06668,-122.07781,,,0,123,,\n";
+    }
+
+    private static String generateCustomCsvData() {
+        return "custom_column1,custom_column2,custom_column3"
+            + "\ncustomValue1,customValue2,customValue3"
+            + "\ncustomValue4,customValue5,customValue6";
+    }
 }
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java
index 3c21a1599..4b15cbd56 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java
@@ -3,6 +3,7 @@
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
 import com.conveyal.datatools.manager.models.ExternalFeedSourceProperty;
 import com.conveyal.datatools.manager.models.FeedSource;
@@ -52,6 +53,7 @@ public class AutoPublishJobTest extends UnitTest {
     public static void setUp() throws IOException {
         // start server if it isn't already running
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
 
         // Create a project, feed sources, and feed versions to merge.
         project = new Project();
@@ -76,6 +78,7 @@ public static void setUp() throws IOException {
 
     @AfterAll
     public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         if (project != null) {
             project.delete();
         }
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/DeployJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/DeployJobTest.java
index d3812276a..e0504d589 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/DeployJobTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/DeployJobTest.java
@@ -27,6 +27,7 @@
 import static com.zenika.snapshotmatcher.SnapshotMatcher.matchesSnapshot;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
@@ -80,6 +81,15 @@ public static void setUp() throws IOException {
         Persistence.deployments.create(deployment);
     }
 
+    @Test
+    void canDownloadConfigs() throws IOException {
+        deployment.customBuildConfigUrl = "http://www.google.com";
+        assertNotNull(deployment.downloadConfig(deployment.customBuildConfigUrl));
+
+        deployment.customRouterConfigUrl = "http://www.google.com";
+        assertNotNull(deployment.downloadConfig(deployment.customRouterConfigUrl));
+    }
+
     /**
      * Tests that the otp-runner manifest and user data for a graph build + run server instance can be generated
      * properly
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/DeploymentGisExportJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/DeploymentGisExportJobTest.java
index ff4a4d2ca..133864c31 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/DeploymentGisExportJobTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/DeploymentGisExportJobTest.java
@@ -1,11 +1,13 @@
 package com.conveyal.datatools.manager.jobs;
 
 import com.conveyal.datatools.DatatoolsTest;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
 import com.conveyal.datatools.manager.models.*;
 import com.conveyal.datatools.manager.persistence.Persistence;
 import com.google.common.io.Files;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -33,6 +35,9 @@ private File[] getFoldersFromZippedShapefile(File zipFile) throws IOException {
         while (e.hasMoreElements()) {
             ZipEntry entry = e.nextElement();
             File destinationPath = new File(destDir, entry.getName());
+            if (!destinationPath.toPath().normalize().startsWith(destDir.toPath().normalize())) {
+                throw new RuntimeException("Bad zip entry");
+            }
             // Create parent directories
             destinationPath.getParentFile().mkdirs();
 
@@ -60,6 +65,7 @@ private File[] getFoldersFromZippedShapefile(File zipFile) throws IOException {
     @BeforeAll
     public static void setUp() throws IOException {
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
         // Calling GisExportJobTest.setUp() creates project and feeds
         GisExportJobTest.setUp();
         user = Auth0UserProfile.createTestAdminUser();
@@ -69,6 +75,11 @@ public static void setUp() throws IOException {
         Persistence.deployments.create(deployment);
     }
 
+    @AfterAll
+    public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
+    }
+
     /**
      * Ensures that shapefiles containing stop features for a deployment can be exported and
      * contain geometry for each stop.
@@ -120,4 +131,4 @@ public void canExportRoutes() throws IOException, SQLException {
     @Test
     public void canExportRoutesFromPatternStops() {}
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/FetchLoadFeedCombinationTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/FetchLoadFeedCombinationTest.java
index 56c99d32c..f7dc2a33b 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/FetchLoadFeedCombinationTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/FetchLoadFeedCombinationTest.java
@@ -3,6 +3,7 @@
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
 import com.conveyal.datatools.common.status.MonitorableJob;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
 import com.conveyal.datatools.manager.models.FeedSource;
 import com.conveyal.datatools.manager.models.FeedVersion;
@@ -53,6 +54,7 @@ public class FetchLoadFeedCombinationTest extends UnitTest {
     public static void setUp() throws IOException {
         // start server if it isn't already running
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
 
         // Create a project and feed sources.
         project = new Project();
@@ -70,6 +72,7 @@ public static void setUp() throws IOException {
 
     @AfterAll
     public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         wireMockServer.stop();
         if (project != null) {
             project.delete();
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java
index 7aac0062f..6d5fd163d 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java
@@ -2,6 +2,7 @@
 
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
 import com.conveyal.datatools.manager.models.FeedRetrievalMethod;
 import com.conveyal.datatools.manager.models.FeedSource;
@@ -11,9 +12,10 @@
 import com.conveyal.datatools.manager.utils.SqlAssert;
 import com.google.common.base.Strings;
 import com.google.common.io.Files;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.Point;
+import org.junit.jupiter.api.AfterAll;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.Point;
 import org.apache.commons.io.FileUtils;
 import org.geotools.data.DataStore;
 import org.geotools.data.DataStoreFinder;
@@ -149,6 +151,7 @@ public void validateShapefiles(File[] files, String agencyName, GisExportJob.Exp
     @BeforeAll
     public static void setUp() throws IOException {
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
         LOG.info("{} setup", GisExportJobTest.class.getSimpleName());
 
         // Create a project, feed sources, and feed versions to merge.
@@ -165,6 +168,11 @@ public static void setUp() throws IOException {
         hawaiiVersion = createFeedVersionFromGtfsZip(hawaii, "hawaii_fake_no_shapes.zip");
     }
 
+    @AfterAll
+    public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
+    }
+
     /**
      * Ensures that a shapefile containing stop features for a feed version can be exported and
      * contains geometry for each stop.
@@ -265,6 +273,9 @@ public File[] getFilesFromZippedShapefile(File zipFile) throws IOException {
         ZipEntry zipEntry = zis.getNextEntry();
         while (zipEntry != null) {
             File newFile = new File(destDir, zipEntry.getName());
+            if (!newFile.toPath().normalize().startsWith(destDir.toPath().normalize())) {
+                throw new RuntimeException("Bad zip entry");
+            }
             FileOutputStream fos = new FileOutputStream(newFile);
             int len;
             while ((len = zis.read(buffer)) > 0) {
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java
index 430adbfcc..1be702b30 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java
@@ -2,6 +2,7 @@
 
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.auth.Auth0UserProfile;
 import com.conveyal.datatools.manager.gtfsplus.GtfsPlusValidation;
 import com.conveyal.datatools.manager.jobs.feedmerge.MergeFeedsType;
@@ -86,6 +87,7 @@ public class MergeFeedsJobTest extends UnitTest {
     public static void setUp() throws IOException {
         // start server if it isn't already running
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
 
         // Create a project, feed sources, and feed versions to merge.
         project = new Project();
@@ -157,6 +159,7 @@ public static void setUp() throws IOException {
      */
     @AfterAll
     public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         if (project != null) {
             project.delete();
         }
@@ -765,7 +768,7 @@ void canMergeFeedsWithMTCForServiceIds4 () throws SQLException {
         mergeFeedsJob.run();
         assertFeedMergeSucceeded(mergeFeedsJob);
         SqlAssert sqlAssert = new SqlAssert(mergeFeedsJob.mergedVersion);
-        // FIXME: "version3" contains ref integrity errors... was hat intentional?
+        // FIXME: "version3" contains ref integrity errors... was that intentional?
         // sqlAssert.assertNoRefIntegrityErrors();
 
         // - calendar table should have 3 records.
@@ -775,12 +778,18 @@ void canMergeFeedsWithMTCForServiceIds4 () throws SQLException {
         // all records from future feed and keep_one from the active feed.
         sqlAssert.calendarDates.assertCount(3);
 
+        // Calendar dates service exception should still be available.
+        sqlAssert.calendarDates.assertCount(1, "service_id='Fake_Agency5:keep_one'");
+
         // - trips table should have 3 records.
         sqlAssert.trips.assertCount(3);
 
         // common_id service_id should be scoped for earlier feed version.
         sqlAssert.trips.assertCount(1, "service_id='Fake_Agency5:common_id'");
 
+        // service_id should still reference calendar dates service exception.
+        sqlAssert.trips.assertCount(1, "service_id='Fake_Agency5:keep_one'");
+
         // Amended calendar record from earlier feed version should also have a modified end date (one day before the
         // earliest start_date from the future feed).
         sqlAssert.calendar.assertCount(1, "service_id='Fake_Agency5:common_id' AND end_date='20170914'");
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/NormalizeFieldTransformJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/NormalizeFieldTransformJobTest.java
index 8eb99259e..6a35edb56 100644
--- a/src/test/java/com/conveyal/datatools/manager/jobs/NormalizeFieldTransformJobTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/NormalizeFieldTransformJobTest.java
@@ -1,6 +1,7 @@
 package com.conveyal.datatools.manager.jobs;
 
 import com.conveyal.datatools.DatatoolsTest;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.models.FeedRetrievalMethod;
 import com.conveyal.datatools.manager.models.FeedSource;
 import com.conveyal.datatools.manager.models.FeedVersion;
@@ -48,6 +49,7 @@ public class NormalizeFieldTransformJobTest extends DatatoolsTest {
     public static void setUp() throws IOException {
         // start server if it isn't already running
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
 
         // Create a project.
         project = createProject();
@@ -58,6 +60,7 @@ public static void setUp() throws IOException {
      */
     @AfterAll
     public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         // Project delete cascades to feed sources.
         project.delete();
     }
diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest.java
new file mode 100644
index 000000000..b8a944f71
--- /dev/null
+++ b/src/test/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest.java
@@ -0,0 +1,61 @@
+package com.conveyal.datatools.manager.jobs.validation;
+
+import com.conveyal.datatools.UnitTest;
+import com.csvreader.CsvReader;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static com.zenika.snapshotmatcher.SnapshotMatcher.matchesSnapshot;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class SharedStopsValidatorTest extends UnitTest {
+
+    @ParameterizedTest
+    @MethodSource("createCSVHeaders")
+    void canHandleVariousCorrectCSV(String headers) {
+        assertThat(SharedStopsValidator.getHeaderIndices(CsvReader.parse(headers)), matchesSnapshot());
+    }
+
+    private static Stream<String> createCSVHeaders() {
+        return Stream.of(
+            "is_primary,feed_id,stop_id,stop_group_id",
+            "feed_id,stop_id,stop_group_id,is_primary",
+            "feed_id,is_primary,stop_group_id,stop_id,feed_id"
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("createInvalidCSVArguments")
+    void attemptToParseInvalidCSV(InvalidCSVArgument invalidCSVArgument) {
+        CsvReader configReader = CsvReader.parse(invalidCSVArgument.csv);
+        Exception exception = assertThrows(RuntimeException.class, () -> SharedStopsValidator.getHeaderIndices(configReader));
+        assertEquals(invalidCSVArgument.expectedError, exception.getMessage());
+    }
+
+    private static Stream<InvalidCSVArgument> createInvalidCSVArguments() {
+        String invalid = "Unknown shared stops header: ";
+        String missing = "shared_stops.csv is missing headers!";
+        return Stream.of(
+            new InvalidCSVArgument("this is a great string, but it's not a shared_stops csv!", invalid + "this is a great string"),
+            new InvalidCSVArgument("", invalid),
+            new InvalidCSVArgument("is_primary,stop_id", missing),
+            new InvalidCSVArgument("is_primary,feed_id,,stop_group_id", invalid),
+            new InvalidCSVArgument("is_primary,feed_id,stop_group_id", missing),
+            new InvalidCSVArgument("feed_id,   is_primary,    stop_group_id,stop_id", invalid + "   is_primary")
+        );
+    }
+
+    private static class InvalidCSVArgument {
+        public String csv;
+        public String expectedError;
+
+        public InvalidCSVArgument(String csv, String expectedError) {
+            this.csv = csv;
+            this.expectedError = expectedError;
+        }
+    }
+}
diff --git a/src/test/java/com/conveyal/datatools/manager/models/FeedVersionTest.java b/src/test/java/com/conveyal/datatools/manager/models/FeedVersionTest.java
index 9bbca2755..13a90b0da 100644
--- a/src/test/java/com/conveyal/datatools/manager/models/FeedVersionTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/models/FeedVersionTest.java
@@ -2,6 +2,7 @@
 
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.persistence.Persistence;
 import com.conveyal.gtfs.error.NewGTFSError;
 import com.conveyal.gtfs.error.NewGTFSErrorType;
@@ -35,6 +36,7 @@ public class FeedVersionTest extends UnitTest {
     public static void setUp() throws Exception {
         // start server if it isn't already running
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
 
         // set up project
         project = new Project();
@@ -48,6 +50,7 @@ public static void setUp() throws Exception {
 
     @AfterAll
     public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         if (project != null) {
             project.delete();
         }
diff --git a/src/test/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformationTest.java b/src/test/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformationTest.java
index 0ab417ddb..f06b8919e 100644
--- a/src/test/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformationTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformationTest.java
@@ -106,6 +106,24 @@ private static Stream<Arguments> createSubstitutionCasesWithOwnExceptions() {
         );
     }
 
+
+    @ParameterizedTest
+    @MethodSource("createCreateNewField")
+    void testCreateNewField(String input, String expected) {
+        NormalizeFieldTransformation transform = createTransformation(
+                "table", "new_field",  null, Lists.newArrayList(
+                        new Substitution("", "new_value")
+                ));
+        assertEquals(expected, transform.performSubstitutions(input));
+    }
+
+    private static Stream<Arguments> createCreateNewField() {
+        return Stream.of(
+                Arguments.of("", "new_value")
+        );
+    }
+
+
     /**
      * Proxy to create a transformation
      * (called by {@link com.conveyal.datatools.manager.jobs.NormalizeFieldTransformJobTest}).
diff --git a/src/test/java/com/conveyal/datatools/manager/utils/sql/SqlSchemaUpdaterTest.java b/src/test/java/com/conveyal/datatools/manager/utils/sql/SqlSchemaUpdaterTest.java
index d3050493f..c374cc010 100644
--- a/src/test/java/com/conveyal/datatools/manager/utils/sql/SqlSchemaUpdaterTest.java
+++ b/src/test/java/com/conveyal/datatools/manager/utils/sql/SqlSchemaUpdaterTest.java
@@ -3,6 +3,7 @@
 import com.conveyal.datatools.DatatoolsTest;
 import com.conveyal.datatools.UnitTest;
 import com.conveyal.datatools.manager.DataManager;
+import com.conveyal.datatools.manager.auth.Auth0Connection;
 import com.conveyal.datatools.manager.models.FeedSource;
 import com.conveyal.datatools.manager.models.FeedVersion;
 import com.conveyal.datatools.manager.models.Project;
@@ -40,6 +41,7 @@ class SqlSchemaUpdaterTest extends UnitTest {
     public static void setUp() throws IOException {
         // start server if it isn't already running.
         DatatoolsTest.setUp();
+        Auth0Connection.setAuthDisabled(true);
 
         // Create a project and feed sources.
         project = new Project();
@@ -60,6 +62,7 @@ public static void setUp() throws IOException {
      */
     @AfterAll
     public static void tearDown() {
+        Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled());
         // Project delete cascades to feed sources.
         project.delete();
     }
diff --git a/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/agency.txt b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/agency.txt
new file mode 100755
index 000000000..a916ce91b
--- /dev/null
+++ b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/agency.txt
@@ -0,0 +1,2 @@
+agency_id,agency_name,agency_url,agency_lang,agency_phone,agency_email,agency_timezone,agency_fare_url,agency_branding_url
+1,Fake Transit,,,,,America/Los_Angeles,,
diff --git a/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/calendar.txt b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/calendar.txt
new file mode 100755
index 000000000..0e75afb73
--- /dev/null
+++ b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/calendar.txt
@@ -0,0 +1,3 @@
+service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date
+common_id,1,1,1,1,1,1,1,20170918,20170920
+only_calendar_id,1,1,1,1,1,1,1,20170921,20170922
diff --git a/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/feed_info.txt b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/feed_info.txt
new file mode 100644
index 000000000..ceac60810
--- /dev/null
+++ b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/feed_info.txt
@@ -0,0 +1,2 @@
+feed_id,feed_publisher_name,feed_publisher_url,feed_lang,feed_version
+fake_transit,Conveyal,http://www.conveyal.com,en,1.0
\ No newline at end of file
diff --git a/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/routes.txt b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/routes.txt
new file mode 100755
index 000000000..b13480efa
--- /dev/null
+++ b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/routes.txt
@@ -0,0 +1,3 @@
+agency_id,route_id,route_short_name,route_long_name,route_desc,route_type,route_url,route_color,route_text_color,route_branding_url
+1,1,1,Route 1,,3,,7CE6E7,FFFFFF,
+1,2,2,Route 2,,3,,7CE6E7,FFFFFF,
diff --git a/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stop_attributes.txt b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stop_attributes.txt
new file mode 100644
index 000000000..b77c473e0
--- /dev/null
+++ b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stop_attributes.txt
@@ -0,0 +1,3 @@
+stop_id,accessibility_id,cardinal_direction,relative_position,stop_city
+4u6g,0,SE,FS,Scotts Valley
+johv,0,SE,FS,Scotts Valley
diff --git a/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stop_times.txt b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stop_times.txt
new file mode 100755
index 000000000..646706c5c
--- /dev/null
+++ b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stop_times.txt
@@ -0,0 +1,5 @@
+trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_type,drop_off_type,shape_dist_traveled,timepoint
+only-calendar-trip1,07:00:00,07:00:00,4u6g,1,,0,0,0.0000000,
+only-calendar-trip1,07:01:00,07:01:00,johv,2,,0,0,341.4491961,
+only-calendar-trip2,07:00:00,07:00:00,johv,1,,0,0,0.0000000,
+only-calendar-trip2,07:01:00,07:01:00,4u6g,2,,0,0,341.4491961,
\ No newline at end of file
diff --git a/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stops.txt b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stops.txt
new file mode 100755
index 000000000..b3f2e8d9f
--- /dev/null
+++ b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/stops.txt
@@ -0,0 +1,7 @@
+stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,location_type,parent_station,stop_timezone,wheelchair_boarding
+4u6g,4u6g,Butler Ln,,37.0612132,-122.0074332,,,0,,,
+johv,johv,Scotts Valley Dr & Victor Sq,,37.0590172,-122.0096058,,,0,,,
+123,,Parent Station,,37.0666,-122.0777,,,1,,,
+
+1234,1234,Child Stop,,37.06662,-122.07772,,,0,123,,
+1234567,1234567,Unused stop,,37.06668,-122.07781,,,0,123,,
diff --git a/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/trips.txt b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/trips.txt
new file mode 100755
index 000000000..387b076cd
--- /dev/null
+++ b/src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-only-calendar-and-trailing-newlines/trips.txt
@@ -0,0 +1,3 @@
+route_id,trip_id,trip_headsign,trip_short_name,direction_id,block_id,shape_id,bikes_allowed,wheelchair_accessible,service_id
+1,only-calendar-trip1,,,0,,,0,0,common_id
+2,only-calendar-trip2,,,0,,,0,0,common_id
\ No newline at end of file
diff --git a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeGraphBuildAndServeManifestAndUserData-1.json b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeGraphBuildAndServeManifestAndUserData-1.json
index fd57ffc19..a38842fc8 100644
--- a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeGraphBuildAndServeManifestAndUserData-1.json
+++ b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeGraphBuildAndServeManifestAndUserData-1.json
@@ -1 +1 @@
-"#!/bin/bash\nexport PATH=\"$PATH:/home/ubuntu/.yarn/bin\"\nexport PATH=\"$PATH:/home/ubuntu/.nvm/versions/node/v12.16.3/bin\"\nrm /usr/share/nginx/client/status.json || echo '' > /dev/null\nrm /var/otp/otp-runner-manifest.json || echo '' > /dev/null\nrm /opt/otp/otp-latest-trimet-dev || echo '' > /dev/null\nrm /var/log/otp-runner.log || echo '' > /dev/null\nrm /var/log/otp-build.log || echo '' > /dev/null\nrm /var/log/otp-server.log || echo '' > /dev/null\naws s3 cp s3://datatools-dev/test-deploy/otp-runner-graph-build-manifest.json /var/otp/otp-runner-manifest.json\nyarn global add https://github.com/ibi-group/otp-runner.git#master\notp-runner /var/otp/otp-runner-manifest.json"
\ No newline at end of file
+"#!/bin/bash\nmkdir /opt/otp/\nexport PATH=\"$PATH:/home/ubuntu/.yarn/bin\"\nexport PATH=\"$PATH:/home/ubuntu/.nvm/versions/node/v12.16.3/bin\"\nrm /usr/share/nginx/client/status.json || echo '' > /dev/null\nrm /var/otp/otp-runner-manifest.json || echo '' > /dev/null\nrm /opt/otp/otp-latest-trimet-dev || echo '' > /dev/null\nrm /var/log/otp-runner.log || echo '' > /dev/null\nrm /var/log/otp-build.log || echo '' > /dev/null\nrm /var/log/otp-server.log || echo '' > /dev/null\naws s3 cp s3://datatools-dev/test-deploy/otp-runner-graph-build-manifest.json /var/otp/otp-runner-manifest.json\nyarn global add https://github.com/ibi-group/otp-runner.git#master\notp-runner /var/otp/otp-runner-manifest.json"
\ No newline at end of file
diff --git a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeOtp2GraphBuildAndServeManifestAndUserData-1.json b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeOtp2GraphBuildAndServeManifestAndUserData-1.json
index fd57ffc19..a38842fc8 100644
--- a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeOtp2GraphBuildAndServeManifestAndUserData-1.json
+++ b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeOtp2GraphBuildAndServeManifestAndUserData-1.json
@@ -1 +1 @@
-"#!/bin/bash\nexport PATH=\"$PATH:/home/ubuntu/.yarn/bin\"\nexport PATH=\"$PATH:/home/ubuntu/.nvm/versions/node/v12.16.3/bin\"\nrm /usr/share/nginx/client/status.json || echo '' > /dev/null\nrm /var/otp/otp-runner-manifest.json || echo '' > /dev/null\nrm /opt/otp/otp-latest-trimet-dev || echo '' > /dev/null\nrm /var/log/otp-runner.log || echo '' > /dev/null\nrm /var/log/otp-build.log || echo '' > /dev/null\nrm /var/log/otp-server.log || echo '' > /dev/null\naws s3 cp s3://datatools-dev/test-deploy/otp-runner-graph-build-manifest.json /var/otp/otp-runner-manifest.json\nyarn global add https://github.com/ibi-group/otp-runner.git#master\notp-runner /var/otp/otp-runner-manifest.json"
\ No newline at end of file
+"#!/bin/bash\nmkdir /opt/otp/\nexport PATH=\"$PATH:/home/ubuntu/.yarn/bin\"\nexport PATH=\"$PATH:/home/ubuntu/.nvm/versions/node/v12.16.3/bin\"\nrm /usr/share/nginx/client/status.json || echo '' > /dev/null\nrm /var/otp/otp-runner-manifest.json || echo '' > /dev/null\nrm /opt/otp/otp-latest-trimet-dev || echo '' > /dev/null\nrm /var/log/otp-runner.log || echo '' > /dev/null\nrm /var/log/otp-build.log || echo '' > /dev/null\nrm /var/log/otp-server.log || echo '' > /dev/null\naws s3 cp s3://datatools-dev/test-deploy/otp-runner-graph-build-manifest.json /var/otp/otp-runner-manifest.json\nyarn global add https://github.com/ibi-group/otp-runner.git#master\notp-runner /var/otp/otp-runner-manifest.json"
\ No newline at end of file
diff --git a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeServerOnlyManifestAndUserData-1.json b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeServerOnlyManifestAndUserData-1.json
index 64c1ee425..26213dbbb 100644
--- a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeServerOnlyManifestAndUserData-1.json
+++ b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/DeployJobTest/canMakeServerOnlyManifestAndUserData-1.json
@@ -1 +1 @@
-"#!/bin/bash\nexport PATH=\"$PATH:/home/ubuntu/.yarn/bin\"\nexport PATH=\"$PATH:/home/ubuntu/.nvm/versions/node/v12.16.3/bin\"\nrm /usr/share/nginx/client/status.json || echo '' > /dev/null\nrm /var/otp/otp-runner-manifest.json || echo '' > /dev/null\nrm /opt/otp/otp-latest-trimet-dev || echo '' > /dev/null\nrm /var/log/otp-runner.log || echo '' > /dev/null\nrm /var/log/otp-build.log || echo '' > /dev/null\nrm /var/log/otp-server.log || echo '' > /dev/null\naws s3 cp s3://datatools-dev/test-deploy/otp-runner-server-only-manifest.json /var/otp/otp-runner-manifest.json\nyarn global add https://github.com/ibi-group/otp-runner.git#master\notp-runner /var/otp/otp-runner-manifest.json"
\ No newline at end of file
+"#!/bin/bash\nmkdir /opt/otp/\nexport PATH=\"$PATH:/home/ubuntu/.yarn/bin\"\nexport PATH=\"$PATH:/home/ubuntu/.nvm/versions/node/v12.16.3/bin\"\nrm /usr/share/nginx/client/status.json || echo '' > /dev/null\nrm /var/otp/otp-runner-manifest.json || echo '' > /dev/null\nrm /opt/otp/otp-latest-trimet-dev || echo '' > /dev/null\nrm /var/log/otp-runner.log || echo '' > /dev/null\nrm /var/log/otp-build.log || echo '' > /dev/null\nrm /var/log/otp-server.log || echo '' > /dev/null\naws s3 cp s3://datatools-dev/test-deploy/otp-runner-server-only-manifest.json /var/otp/otp-runner-manifest.json\nyarn global add https://github.com/ibi-group/otp-runner.git#master\notp-runner /var/otp/otp-runner-manifest.json"
\ No newline at end of file
diff --git a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-0.json b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-0.json
new file mode 100644
index 000000000..efafa6fbc
--- /dev/null
+++ b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-0.json
@@ -0,0 +1,6 @@
+{
+  "STOP_GROUP_ID_INDEX" : 3,
+  "STOP_ID_INDEX" : 2,
+  "IS_PRIMARY_INDEX" : 0,
+  "FEED_ID_INDEX" : 1
+}
\ No newline at end of file
diff --git a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-1.json b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-1.json
new file mode 100644
index 000000000..0a5c3f7a5
--- /dev/null
+++ b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-1.json
@@ -0,0 +1,6 @@
+{
+  "STOP_GROUP_ID_INDEX" : 2,
+  "STOP_ID_INDEX" : 1,
+  "IS_PRIMARY_INDEX" : 3,
+  "FEED_ID_INDEX" : 0
+}
\ No newline at end of file
diff --git a/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-2.json b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-2.json
new file mode 100644
index 000000000..351f7a0d6
--- /dev/null
+++ b/src/test/resources/snapshots/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidatorTest/canHandleVariousCorrectCSV-2.json
@@ -0,0 +1,6 @@
+{
+  "STOP_GROUP_ID_INDEX" : 2,
+  "STOP_ID_INDEX" : 3,
+  "IS_PRIMARY_INDEX" : 1,
+  "FEED_ID_INDEX" : 4
+}
\ No newline at end of file