SOS-2026

For master. 6.2.x PR is different