Cleanup for conditional PID namespace disabling (Thanks Dave!)
Cleanup for conditional PID namespace disabling (Thanks Dave!)

Trophime/singularity,Trophime/singularity,Trophime/singularity,Trophime/singularity