SFTP; Subscription/Usagepoint; sprint 4.0.6

See separate commit comments