EPD-190: fixed mistake in merge commit: e57225a0a2aa142189e11ca3a6cdab8d357abd91