Rebase the code against latest trunk