am fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge

* commit 'fd14e2425fc0d1efa1295d1dbf6b0d1b058730b4':
  JGO77
  JGO76