COMP: Use string::empty instead of char* comparison
Merge branch 'bug-18353-port-diffusion-readers-writers'