@vident - it seems like there are two different issues. one is missing country info in the 1116AMT, there is also another issue with the date shown as "Various" instead of an actual date in 1116.
The 2nd issue has a workaround which is manually override the date with "12/31/2020".
