Fixing the test that was failing after 81b6bf5b94e1d80eb48449f2790f83dc8f87d795.
Merge remote-tracking branch 'origin/1.10' into space-integration-12.3-code-freeze-branch
Merge branch 'space-integration-12.3-code-freeze-branch'