am b1e4a4f2: Merge "fix broken links bug 6879771" into jb-dev

* commit 'b1e4a4f25f9fd4d1cee4629e71acb04e3d4e5ec0':
  fix broken links bug 6879771