Merge "compose attachment refactor"