Fix SOC-4228