Backport attachment api

Merge request reports