am c984699a: DO NOT MERGE Add missing features of JB and JB MR1

# Via Brian Muramatsu
* commit 'c984699addd4e4e25ceac2f9221c54c81be5ba9a':
  DO NOT MERGE Add missing features of JB and JB MR1