TSP-4673-demo: processed code review