Merge "Southbound UT: Fix SouthboundMapper stackoverflow issue"