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

@rkorytkowski check