Changes for feature parity with 0.6 rel Change-Id: I7021905da0c3aaf86b34f22e930b3ca47d708e76 Signed-off-by: Ashish Singh<ashish.singh@sap.com>