Fix MRN-508

Change-Id: I31f0dd9843bb27236cd7acd2899b3d3b27c32ba8