Merge branch 'attachment_url_shouldnot_be_overwritten' into 'master'

Attachment url should not be overwritten

Fixes #1786

See merge request !1308