TSP-4667: processed code review