PR: 80187 Submitted by: Vasil Dimov <vd@datamax.bg>
Partially submitted by: archie
PR: 26190 Submitted by: Kevin Van Maren <vanmaren@fast.cs.utah.edu>