Merge branch 'main' into 'security'

# Conflicts:
#   microservices/user-service/src/main/resources/application.yml