Merge branch 'gpe-defer' into release