Merge branch 'sf-merge-test' into updates-for-andrew