PR #2592 reviewed