Merge branch 'dev' into 'master'

Dev

Closes #852

See merge request !182
2 jobs for xpub-epmc-r1-3-3 in 48 seconds (queued for 4 minutes and 3 seconds)
latest
Status Job ID Name Coverage
  Build
passed #54800
build

00:00:12

 
  Test
passed #54801
lint

00:00:36