Merge branch 'master' into '97-make-the-focus-visible-during-tabbing'

# Conflicts:
#   src/app/components/shared/footer/footer.component.html
5 jobs for 97-make-the-focus-visible-during-tabbing
in 8 minutes and 42 seconds and was queued for 1 second