Fixed MRN-922

Change-Id: Idb1967814686f06d4e362d66136f283469c49579