clarify attrs
auto-merge staging into master