merge ‘losp' into jb3