Merge branch 'main' into add-combined-formats-extrend-tests