Squashed commit of PR #281 in main repo.