Merge branch 'master' into 'dev-autosubmit'

# Conflicts:
#   tools/libs.R
2 jobs for dev-autosubmit
in 0 seconds, using 0 compute credits, and was queued for 105 minutes and 24 seconds