[PATCH 00/21] Fixed "Duplicate ID, which will not be added" errors"