TSP-4673 Small fix for branch merging