COMP: variable is already a c string
Merge branch 'bug-18353-port-diffusion-readers-writers'