diff --git a/.circleci/Makefile b/.circleci/Makefile
index d24027f1d9..db204e8b35 100644
--- a/.circleci/Makefile
+++ b/.circleci/Makefile
@@ -78,6 +78,8 @@ define GEN_CONFIG
 	@mv -f $@.tmp $@
 endef
 
+# Always re-generate the config, as we can't trust timestamps with git.
+.PHONY: $(OUT)
 $(OUT): $(CONFIG_SOURCE) 
 	$(GEN_CONFIG)
 	@echo "$@ updated"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index dafc9abbad..59ea536b54 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,7 +108,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -180,7 +180,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -245,7 +245,7 @@ jobs:
     steps:
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -365,7 +365,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -437,7 +437,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -520,7 +520,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -592,7 +592,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -664,7 +664,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -736,7 +736,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -808,7 +808,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -880,7 +880,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -1089,7 +1089,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -1161,7 +1161,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -1233,7 +1233,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -1305,7 +1305,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
@@ -1377,7 +1377,7 @@ jobs:
         version: 19.03.12
     - add_ssh_keys:
         fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
     - checkout:
         path: .
     - run:
diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml
index 4170e68cc4..4fabbb08ac 100644
--- a/.circleci/config/@build-release.yml
+++ b/.circleci/config/@build-release.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -214,7 +214,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -281,7 +281,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -348,7 +348,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -415,7 +415,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -482,7 +482,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -549,7 +549,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -616,7 +616,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -683,7 +683,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -750,7 +750,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -817,7 +817,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -884,7 +884,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -951,7 +951,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -1018,7 +1018,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -1085,7 +1085,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -1152,7 +1152,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml
index a1ef6c0c9d..65c3313962 100644
--- a/packages-oss.lock/pkgs.yml
+++ b/packages-oss.lock/pkgs.yml
@@ -2,7 +2,7 @@
 # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec.
 # ***
 lockid: 6cd3353dfe5a6bf9
-packagespec-version: 0.2.2
+packagespec-version: 0.2.4
 cache-version: 10
 packages:
   - packagespecid: b44cab2d26b1c045151c8748f823036c2f2f064f