Merge branch 'code-cleanup-advect-momentum' into 'main'

Add fluid.enable.momentum_conservative_update

See merge request !235