This change fixes issues identified in the commit 5f3d577e5a. Change-Id: Idbd935f5f60ad043faa0d4982b3e101ef7c07d60 Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
5f3d577e5a