Safer core-status on D8 - again.