Implement enhancements specified in bug #182778.
3 files changed