Port changes from core