Merge branch 'flexible_attributes'