Pull request for 9e991f78e9bd9f328031727e5d82f6226ba760c4