Merge pull request #11745 from agh1/0000-00-00