Merge pull request #14728 from eileenmcnaughton/last_icing