Merge "Use unique entries only. Do not merge." into jb-dev