Merge pull request #23848 from arjantijms/soteria300m2

Integrate Soteria 3.0.0-M2