Fixed MRN-680

Change-Id: I878936ae454ebca837bf1b00a14c377ae628c782
Merge "Fixed MRN-680"