immutable attributes modification error fix
Merge branch 'additional_attributes'