@garyrussell, make a quick review, please. And pay attention here: are we OK with a name of this attribute? For me - it's OK.
All others are minor and can be addressed during merge.