Merge pull request #2014 from valentinewallace/2023-02-rework-partial-pmt-fail