Merge remote-tracking branch 'remotes/rth/tags/pull-sfp-20191030' into staging