Merge "Unified Two Phase Commit implementation, fixed BA to BI connection"