am 6558d48b: Merge "Fix test" into jb-dev

* commit '6558d48b0ee4ee86aa978d896115f6389263ae99':
  Fix test