Merge branch 'main' into 'develop'

# Conflicts:
#   exist-app/build.properties
7 jobs for develop in 6 minutes and 45 seconds (queued for 5 seconds)