Added diffs from Dusan. Added SAP backport by Ralph