Initial revision for 21e changes. WIP

[skip ci]
4 jobs for master in 35 minutes and 4 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #1835
linux
linux-runner

00:25:05

passed #1836
osx
osx-runner

00:09:59

passed #1833
linux
linux-runner

00:18:32

passed #1834
osx
osx-runner

00:09:59