TSP-4849: Changes after review