Merge branch 'master' into 'production'

Preparing release

See merge request es/NES!80
3 jobs for v1.1.1
in 36 seconds, using 0 compute credits, and was queued for 2 seconds