Complete sync with S5 bringup