Merge pull request #13303 from seamuslee001/5.9