Merge branch 'develop-v2.1.1' into issue-8

2 jobs for issue-8
in 27 seconds, using 0 compute credits, and was queued for 5 seconds