Merge branch 'develop' into '9-internal-component-versioning-1-0-0-snapshot'

# Conflicts:
#   pom.xml
4 jobs for 9-internal-component-versioning-1-0-0-snapshot
in 8 seconds, using 0 compute credits, and was queued for 2 seconds