Core/Sai: Added missing changes in 4060fb1b592ef50ab0c5bd450ddc94a1461e900e