-> Fix for issue 7173877 -> Fix for issue 7173587 Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885