reviewed by emiller was failing in dev environments for duplicate ids
merged in remote changes