Merge remote-tracking branch 'origin/add-combined-formats-extrend-tests' into ci/test-ext-rend-test-extension