Merged r5566:5676 from jcorgan/snd into trunk, with minor changes. Component gr...