am 534ea47f: Merge "Yet another attempt to fix (issue 6282761)" into jb-dev

* commit '534ea47ffd3a0c3c2e2c883200926393110d174c':
  Yet another attempt to fix (issue 6282761)