Merge branch 'pe/cleanup' into next