Lps 48578 Rebase and fix bugs.