4200b64365
Harvested from PR #2851 by @aboimpinto Co-authored-by: Paulo Aboim Pinto <aboimpinto@gmail.com> Co-authored-by: Hunter Bown <hmbown@gmail.com>