Feature textchanges, closes #1229 and #1231