fixes for spurious spec failures
updated cs_params_spec to only run when the fix is enabled
Merge recent work on develop.