Fix MRN-515

Change-Id: Ic9dd6508b6915d130d5b8e55ddd73598bfc64c29