Merge "Revert NPMS threshold to BFGS." into sc-dev