TSP-4673 / TSP-5237 updated docblock