Merge remote-tracking branch 'arco/jb-3.0'