Merge branch 'pdc-regression' into release