Merge branch 'master' into UITEN-318--floating-collection-permissions #1184

All 98 tests pass, 12 skipped in 2m 17s

    1 files ±0   28 suites ±0 2m 17s ⏱️ +2s
110 tests ±0   98 ✔️ ±0 12 💤 ±0 0 ❌ ±0
112 runs ±0 100 ✔️ ±0 12 💤 ±0 0 ❌ ±0

Results for commit f70f6e6. ± Comparison against earlier commit 87a0f47.