Pull ak_sync branch changes into root_strikers branch