Fix MRN-521

Change-Id: Icc5562fef871e9564a0fec40edfd74b40241eff9