Merge branch 'update-conda-configuration' into 'master'

3 jobs for 3-impossible-to-use-devccdsethwpar in 11 minutes and 9 seconds (queued for 1 second)