Merged r4354:4390 from developer branch jcorgan/digital into trunk.