Merge remote-tracking branch 'origin/release-v1-1-4' into release-v1-1-4

# Conflicts:
#	environment.yml
3 jobs for release-v1-1-4
in 12 minutes and 33 seconds, using 0 compute credits, and was queued for 1 second