Merge from sfPrep.
Merge branch 'development' into hfBugs