All Support Credits addon changes for portability completed.
Merge remote-tracking branch 'ocpv9/v9' into v9