Forward compatibility towards sf2.5, use the Interface as typehint instead
Merge remote-tracking branch 'hostnet/forwards-compatibility-sf-25'