Merge "SF: Add TransactionHandler"