Merge branch 'pxefix' into pathbased