Merge branch 'main' into 'dev'

# Conflicts:
#   helm-chart/templates/adservice.yaml
#   helm-chart/templates/cartservice.yaml
#   helm-chart/templates/productcatalogservice.yaml
#   src/adservice/gradle-6.3/bin/gradle
#   src/adservice/gradle-6.3/bin/gradle.bat
#   src/adservice/src/main/java/hipstershop/AdService.java
#   src/cartservice/Dockerfile
#   src/cartservice/Program.cs
#   src/cartservice/Startup.cs
#   src/cartservice/cartservice.csproj
#   src/cartservice/cartstore/RedisCartStore.cs
#   src/currencyservice/server.js
#   src/paymentservice/index.js