PR: 26977 Submitted by: David Johnson <david@usermode.org>
PR: 21533 Submitted by: David Johnson <david@usermode.org>