Merge pull request #10962 from eileenmcnaughton/fitems