Total rebase for 3.97