Merge branch 'jb43' into jb43-L