Merge pull request #23786 from arjantijms/yasson204

Integrate yasson 2.0.4