Merge branch 'dev' into 'master'

Dev

Closes #820

See merge request !178
2 jobs for xpub-epmc-r1-3-0 in 49 seconds (queued for 4 minutes and 32 seconds)
latest
Status Job ID Name Coverage
  Build
passed #54639
build

00:00:12

 
  Test
passed #54640
lint

00:00:36