Merge branches 'hand' and 'attachments' into develop