Merge branch 'bc/portable'