Merge remote-tracking branch 'refs/remotes/ivan/feature/delivery-format-test-mail'