Merge SAP Gateway Sync related work into master