Merge "Do no use text sub for empty string in sim." into main