Rebase momentum_policy on master