Implement PR679: