Merge with trunk

textarea please. Some textual info has many lines. Otherwise looking good.