Merge branch 'mjog/589-attachment-keyword-check' into 'mainline'

Attachment keyword fixes

Closes #589

See merge request !334
5 jobs for mainline in 24 minutes and 5 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #460564
ubuntu

00:14:26

 
  Test
passed #460565
flatpak

00:08:48

 
  Deploy
passed #460568
nightly

00:00:50

passed #460566
review

00:00:44

manual #460567
allowed to fail manual
stop_review