Merge pull request #424 from jbrodman/master

Tracking Attribute API changes in ToT