UNITSOFMEASUREMENT-82: EDR 
Tagging
Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-82