Rebase to 3.0.31 clean