Merge branch 'pj/portable'