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

2 jobs for issue-6
in 25 seconds, using 0 compute credits, and was queued for 25 seconds