Merge branch 'fix/several_small_text_and_other_changes' into 'develop'

Fix/several small text and other changes

See merge request !939
2 jobs for <span class="ref-name">feat/email_template_variables_per_kind_with_specific_methods</span> in 37 minutes and 54 seconds (queued for 18 seconds)
Status Job ID Name Coverage
  Test
passed #94831
system

00:37:54

passed #94830
test

00:10:35