Initial revision for 21e changes. WIP

[skip ci]
2 jobs for master in 24 minutes and 11 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #1837
linux
linux-runner

00:24:11

passed #1838
osx
osx-runner

00:08:37