Merge pull request #90356 from ktoso/wip-assert-fixup