Cherry

Split off from pull request 738