Merge branch 'pj/portable' into next