DEVIDM-131: Removed duplicates