am a934e35c: Reconcile with jb-mr2-release - do not merge

* commit 'a934e35ce9dfd05fc368b8b26820c344587b9734':
  JWR10B