Merge "Bug 4957 Fix methods for change TxChainManager"