Merge "Updates to TCA spec and output format"