This is a manual sweep of !46803 (merged) to master.
Update fJVT configuration in CP algorithms.
/cc @krumnack @jburr @mmuskinj