Merge branch 'develop' into '51-helm-chart-secrets'

# Conflicts:
#   kubernetes/helm/openslice/templates/artemis.yaml