Merge branch 'wip/validator-fixes' into 'master'

Validator polish and fixes

Closes #294

See merge request !163
3 jobs for master in 21 minutes and 47 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #236733
fedora

00:08:27

passed #236734
ubuntu

00:16:45

 
  Test
passed #236735
flatpak

00:05:01