Changed Attr.value's internal data structure
auto-merge staging into master