fork core

Change-Id: I0996d88f8e099114c4ce19d4d393eac27bf4ae3f