Merge branch 'develop-v1.1.2' into prerelease-v1.1.2

2 jobs for develop-v2.1.1
in 42 seconds, using 0 compute credits, and was queued for 2 minutes and 20 seconds