EMR-1048

EMR-13008
EMR-1048