Rebase and QA Cleanup