Merge branch 'master' into feature/conda_deployment

Conflicts:
	.gitlab-ci.yml
	tests/CI_docker/context/py_tools_ds_ci.docker