Merge remote-tracking branch 'origin/v12.8_bug_settlementJob_20240329' into v12.8_bug_settlementJob_20240329