Merge branch 'jk/test-ports'