am 30ca8004: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '30ca8004cf259c5dceab5cec06cab5ae9a17d89b':