Trunk-4294

https://tickets.openmrs.org/browse/TRUNK-4294