Initial revision for 21e changes. WIP

[skip ci]
2 jobs for master in 18 minutes and 37 seconds
Status Job ID Name Coverage
  Test
passed #1743
linux
linux-runner

00:18:37

passed #1744
osx
osx-runner

00:09:14