Merge "fix broken links bug 6879771" into jb-dev