I believe the 2nd one, which is more in line with the CARES Act.

As some of us have discussed, IRS' Q&A are not authoritative.

Wonder what the software will compute when a date of death is entered? Oh, I know, Intuit programs according to IRS Publications, not the law.