Rebase Golden & Update for Tab 3