Merge branch 'net-sfp-small-improvements'