Merge "Fix bug for duplicate entries" into main