add field_attributes helper
update changelog
Merge remote-tracking branch 'upstream/master'