am 8a3f6fc0: Reconcile with jb-release

* commit '8a3f6fc0f9498b045caeea73592feca31170f61d':