Merge branch 'sprint/GiddyGiraffe.fix.duplicated-messages-issue-in-messenger' into 'master'

(fix): don't send offset and finish if they weren't explicitly provided

Closes #380

See merge request !358