commit for stable version

Change-Id: I2379a5a4b2df3a184867dca68eba35d8109664fe
Signed-off-by: li levi <levi.li@sap.com>