Merge "Fix a bug with a duplicate entry" into jb-dev