[TASK ]Merge branch 'develop' into 'update-solr-in-ddev'

# Conflicts:
#   .ddev/docker-compose.solr.yaml
9 jobs for update-solr-in-ddev in 6 minutes and 26 seconds (queued for 4 seconds)