397.38 folding in string handling from dev branch