Merge pull request #9930 from annando/no-item