Merge branch 'rs/t6300-compressed-size-fix' into maint-2.43