fixing logging of unsanitized string
Merge branch 'next' into sam_2156_env_stuff