Resolve #3554477 "Fix cs issues"

berlinerrequested to merge
issue/form_options_attributes-3554477:3554477-fix-cs-issues into 2.1.x

Closes #3554477

Merge request reports