Merge pull request #3145 from valentinewallace/2024-06-AP-prefactor-followup