Merge branch '22themes/master/lundquism' into 'master'

22themes/master/lundquism

See merge request !13
2 jobs for master in 3 minutes and 14 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Build
passed #6699
build

00:01:46

 
  Test
passed #6700
unitTests

00:01:27