UNITSOFMEASUREMENT-82: EDR 

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