core site rebase to master