Merge pull request #6422 from annando/private-answer