Enhancements which were requested in the issue tracker

See commit message for details.