Merge branch 'jk/portable'