Merge pull request #2776 from mfournier/unblock_pr_2737