Rebase to master-2.5