Merge branch 'master' into '39-checkmark-in-theme-menu-misplaced'

# Conflicts:
#   src/app/components/shared/footer/footer.component.html