Merge branch 'fix/object-attachment-spoof' into 'develop'