AbstractEntity hasAttachments replaced with hasAttachment with an attachemtn name parameter
Merge remote-tracking branch 'origin/master'