Merge "Client feedback: Fix javadoc mistake" into tm-dev