optionally qualify attribute names
support array format type
fix merge conflicts