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

2 jobs for prerelease-v1.1.2
in 17 seconds, using 0 compute credits, and was queued for 4 minutes and 23 seconds