Saving Check Factor value
Reviewer: Dan Jao
Issue: GCP-8790
merge with master