New deal starts next season and includes a full no-trade clause. Good deal for him and the team, especially if he's still catching by the end of the contract.

The deal will be announced at 7 p.m.