am a2c628fb: Merge "Fix bug 6499508" into jb-dev

* commit 'a2c628fb402610ce65371fb06d5adaf7eaf9df9b':
  Fix bug 6499508