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