am 5081af57: Reconcile with jb-release

* commit '5081af57d369e1e6de09f67836bff0d40cda711e':
  JRN90