Merge branch 'main' into 'accounting-docker'

# Conflicts:
#   docker-compose.yml
#   scripts/compose-healthcheck.sh