Pulled in more changes, just core/