Merge pull request #2971 from jbesraa/review-club/2815