petermattis Merge pull request #8941 from petermattis/pmattis/tighten-process-raf… …