Merge remote-tracking branch 'origin/proactive-dev-2.5' into proactive-dev-2.5

# Conflicts:
#	.gitlab-ci.yml
8 jobs for proactive-dev-2.5 in 26 minutes and 40 seconds (queued for 2 seconds)