PR 4 from original repo

Recreate Mark Scherer PR from original repo