Merged from jb43-legacy