Change terminology from Sender to Forwarder.
Merge branch 'dev' into test