Merge remote-tracking branch 'origin/develop' into FUNC-859/enable-private-exposure

#6371 was squash-merged into develop, so develop's copy of the workers push
work shares no ancestry with the merge of it this branch already carries. A
plain merge therefore re-conflicted all four push files against content the
branch already had. Recorded with an explicit merge base of 539986a — the
FUNC-848 tip that squash came from, verified content-identical to develop —
which resolves cleanly and leaves the tree unchanged.

Author: johnstonmatt