Merge pull request #8569 from bluewavenet/patch-3