Changed simple attr's internal data structure
auto-merge staging into master