My only concern is that box 12 Y seems to indicate a current year deferral.  Whereas, the amounts in box 11 are actually prior year deferrals being paid out in the current year.  So I'm not sure that solves the problem.  Still wondering if there is a fix coming in the near future.