Initial revision for 21e changes. WIP

[skip ci]
5 jobs for master in 22 minutes and 15 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #1884
linux
linux-runner

00:08:34

passed #1882
osx
osx-runner

00:13:40

failed #1883
linux
linux-runner

00:00:19

failed #1877
linux
linux-runner

passed #1878
osx
osx-runner

00:47:03