Merge "String update for effect suppressors" into pi-dev