Merge branch 'sfc-3.13' into master

Merge sfc fixes destined for 3.13, as development for 3.14+ depends on
some of them.