[PATCH] SAP client - revisited