Merge branch 'sfc-3.9' into master