https://issues.openmrs.org/browse/OTHER-35