Log exceptions in the attachment loader step
Merge remote-tracking branch 'origin/master'