https://issues.openmrs.org/browse/OCLM-2