Merge branch 'main' into 'feat/observability'

# Conflicts:
#   module-movie/src/main/resources/application.yml