Core update from core-ng