8130710: Better attributes processing

Reviewed-by: jbachorik, dfuchs, ahgross
2 files changed