Merge "SF: Clean up around transaction commit"