BW merged singleton changes per pull request.
Merge pull request #4070 from bobjustbob/master

BW merged singleton changes per pull request.