Making it possible to switch between new and old momentum evaluation
FYI @ahennequ @gligorov @rmatev @dovombru @jzhuo @mfontana