Gail Badner, you might want to backport this to 5.1 and 5.0. Also, let me know if there's anything you'd like to add.