Merge pull request #10189 from eileenmcnaughton/pan_tunc