wording for TW-31544
wording @ TW-32057
Merge branch 'v0.9' into v0.10