Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into v6.3_small_version_20231102