Merge "Fix NameNotFoundException documentation" into tm-dev