fixxed uploade spec?
Merged 'dev'.
Finish attachments