Review of PR #3311