Based on most recent commits made by @ufundo in this PR: https://github.com/civicrm/civicrm-core/pull/31478/commits