Merge branch 'original/jb43-legacy'