Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	.gitlab-ci.yml