esl-8845. Attachment requirement support and tests