Merge branch 'develop-v1.1.1' into develop-v2.1.1

2 jobs for develop-v2.1.1
in 26 seconds, using 0 compute credits, and was queued for 3 seconds