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

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