Merge branch 'gpe-regression-fixes' into release