Backport frozen strings from trunk