merging the ES PR isn't urgent, but one reason to merge sooner rather than later is so that we can get on with working on the signing pipeline