PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 24832 Submitted by: Andrew J. Korty <ajk@iu.edu>