Merge from sfPrep.